| commit | 024f97c67b179894d7333cd7c68d9787f2d9382f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 01 15:41:57 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 01 15:41:57 2013 -0800 |
| tree | 2c4ff9bf4e619b77bac41ad1bf8a4563d9252505 | |
| parent | 2b0c471ce07b57449762cbfd4303a0855c022e45 [diff] | |
| parent | 825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf [diff] |
am 825f29b1: Merge from jb-mr1.1-dev # Via Jean-Baptiste Queru * commit '825f29b1c8f0c420af5dc6b05f0dbbd5b1ec36bf':