| commit | 7a9b014e1c511a04ffbb2315bb9a226104c0fb6f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 08 15:42:06 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 08 15:42:06 2013 -0800 |
| tree | 6f9fa068000c717033fbdebff9fcd14582e65fee | |
| parent | ad350a896fc7e09b76cf4bea6fc561095f07a5d6 [diff] | |
| parent | 3b5e13aa51764a18e951e8ff3e0772d8f7c2e167 [diff] |
am 3b5e13aa: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (2) and The Android Open Source Project (1) * commit '3b5e13aa51764a18e951e8ff3e0772d8f7c2e167':