| commit | 0441c7a309248cfe01703c625867004a212382b1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:25 2013 -0700 |
| tree | 89c8a6f352e230d2ae5ea6c3c13afe1a8ae5eb66 | |
| parent | 5fc7a383eb5e7ea0695af3f2b0efc9210bd8ecb3 [diff] | |
| parent | 9b5408ffd6f6100e6a62d99983e1524c03ac1304 [diff] |
am 9b5408ff: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9b5408ffd6f6100e6a62d99983e1524c03ac1304':