| commit | a9228942f0a6291e2721729ddf9a28f2318683e0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:14 2013 -0700 |
| tree | b32b5983d58a170fcd74e2c808c565e7bed731de | |
| parent | 2579dbcfcf4d1efb0231e9b545de19fc6350f406 [diff] | |
| parent | 19ec15b247523ec8b0c6651e01bf746674d424d1 [diff] |
am 19ec15b2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '19ec15b247523ec8b0c6651e01bf746674d424d1':