commit | 3a5e50219d36f7300f0275a41e77579c4cf11c93 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:27:03 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:27:03 2012 -0800 |
tree | 8850db8a07d3ff4791a37c4de023cd7517a5ae11 | |
parent | 9875a32f2e6304f6e148cceeae8e75d64d061994 [diff] | |
parent | 34c380aa8560df7d10edf30e489f229016b54cdc [diff] |
am 270ee0c6: am 34c380aa: Reconcile with jb-mr1-release - do not merge * commit '270ee0c6c62e1bcf278892094653e7ab008b3685':