| commit | 796f0ebea3e6be486e9052f78ecaade2a02f26ca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 12:42:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 12:42:16 2012 -0700 |
| tree | d8ea7c4afcc18c6a06d90221a8d3bbe4e7e9df57 | |
| parent | 31bd5a89ce0e764e7df361ac2306312bbfa22155 [diff] | |
| parent | f09cdd928d4874f16a72ce79e3f4a0c749a9abc3 [diff] |
am f09cdd92: (-s ours) am baa97012: am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'f09cdd928d4874f16a72ce79e3f4a0c749a9abc3': JZO40