| commit | aa855db411712f51dbf09c64bd63b23a9df67c67 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:21:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 09:21:14 2012 -0700 |
| tree | 0335ce93c58637fd4cfa6b18f74e49066dbaf07b | |
| parent | bbfabb2e8ba9557d8b8c9d880a713c2927d84f47 [diff] | |
| parent | 121361c3b41c9c3d4016e4658be88d98bc8cbca1 [diff] |
am 121361c3: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '121361c3b41c9c3d4016e4658be88d98bc8cbca1':