commit | 406ae4458408b245ca9c94d175e7f18ecc7a23d0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 03 18:05:27 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 18:05:27 2013 -0700 |
tree | 8f78e3b53334bbaf8b4e81602e97409d4b093dae | |
parent | 4ea30292035fcec4a4ceca27b50a3efde39c9ac4 [diff] | |
parent | 7d62220a92be123ae207aa123ce6a01d597688f9 [diff] |
am 7d62220a: Reconcile with jb-mr2-release - do not merge * commit '7d62220a92be123ae207aa123ce6a01d597688f9':