| commit | 96b17f8e9972cb69e2ae8ce9cb137ecc6ca7763a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 09:00:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 09:00:24 2012 -0700 |
| tree | c2e98ffe144c5f5169864118b245b5353fe21cd5 | |
| parent | 0b7e0983d4dab0796fd37439859250c88142463b [diff] | |
| parent | a8a731bf7fe8d42af56c7481acd99628dd1df2f0 [diff] |
am a8a731bf: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'a8a731bf7fe8d42af56c7481acd99628dd1df2f0': JZO54I