| commit | 99760d222c3db432ce97c1e851a0ef3d94657bdc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:32:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:32:14 2012 -0700 |
| tree | 4d1cf7a2c366d85a06ec8c2ebc2704e7641129f8 | |
| parent | 9dc7c7f242cbb216f1298a1046e2bd4ca509a27c [diff] | |
| parent | 694b033a0da0774a1a38e253cad536e4b1f897c2 [diff] |
am 694b033a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '694b033a0da0774a1a38e253cad536e4b1f897c2':