| commit | 75ba99fb26ca17208ea60b3bdccda0a4cc752ac7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 15:14:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 15:14:26 2012 -0700 |
| tree | 797e64866be6173e0530429f2a26c69601d7f57a | |
| parent | 534162f8c65e44ce086697266e35795da60cc1f5 [diff] | |
| parent | e3a6038600ca1447d2920cc9351a1f70fe17e9b2 [diff] |
am e3a60386: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'e3a6038600ca1447d2920cc9351a1f70fe17e9b2':