| commit | fa3c2d9a766202c026e2856ec9111b69a06c6f4c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 03 13:25:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 03 13:25:06 2012 -0700 |
| tree | a1c2d75ba2ad3f2fa032e6923bce9ca1c02eee61 | |
| parent | c814bcefd7ff65cbc91b66fb67a038fbd6ec9944 [diff] | |
| parent | ad808f5da422b13489edb04b38daf871e5f977a6 [diff] |
am ad808f5d: (-s ours) Reconcile with jb-release - do not merge * commit 'ad808f5da422b13489edb04b38daf871e5f977a6': JRO03L JRO03K JRO03J JRO03I