| commit | b111239deb57873905d8e0556d05b2ab26839884 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 15:22:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 15:22:48 2012 -0700 |
| tree | 8efc539d1247e764b9864a7519c21c251190b9af | |
| parent | 74f8cab3959f9e7d65d2efecf86aef44a18f7d6b [diff] | |
| parent | 8d950f8424bd5f48ce51b09b915964ec109bef55 [diff] |
am 8d950f84: (-s ours) am 6bdeb448: am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '8d950f8424bd5f48ce51b09b915964ec109bef55': JZO38