commit | 04ec72bca7a0a515c90367f208501c1415e37455 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 08 08:18:47 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 08:18:47 2012 -0700 |
tree | e66d31aebe01a09126b9132e8ff20411f27f6c77 | |
parent | 456dd07b463a83fca210c26d5364eb9def28fb8e [diff] | |
parent | 642b0b71a3557915687c1bed1a57ac326a308507 [diff] |
am 642b0b71: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '642b0b71a3557915687c1bed1a57ac326a308507':