| commit | efadcc97b25302625869ae4beb954564849f862a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 18:59:08 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 18:59:08 2012 -0700 |
| tree | b63279349a850f5b56e52c815cc49210034f3ceb | |
| parent | c4c7f2d1da2f91035c2a343526223fda5b341838 [diff] | |
| parent | 59c5e0deb7015757f126535fa53df024bbbe4786 [diff] |
am 59c5e0de: (-s ours) Reconcile with jb-mr0-release - do not merge * commit '59c5e0deb7015757f126535fa53df024bbbe4786':