| commit | e362e85e1a3bf857ce7defb3aa7eb3d0dc032c8b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 13:03:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 13:03:27 2012 -0700 |
| tree | 844e7a73ede2e29941ca91a15d2308910fe80791 | |
| parent | 3d5e58bea72b88bac4710a898dc856ede7407122 [diff] | |
| parent | 44f4f00e8dad1b96e7a3ba1a3552531c458ce6e5 [diff] |
am 44f4f00e: (-s ours) am 1d55338d: am 91f71ca3: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '44f4f00e8dad1b96e7a3ba1a3552531c458ce6e5': JZO54J