| commit | b3ac0f956512733e2d398cafea8c963dfd0fb58d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 08 15:42:09 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 08 15:42:09 2013 -0800 |
| tree | 3aec0180a616315b7a4ac26de2deb9569946ebe0 | |
| parent | 537a4d190ac1cb7ab62b712126ef2b72feba174a [diff] | |
| parent | 385969235051b2d8d9f4b1e5d2d6d207ab6a8898 [diff] |
am 38596923: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (1) and The Android Open Source Project (1) * commit '385969235051b2d8d9f4b1e5d2d6d207ab6a8898':