commit | b3e8a615d0fdb18bd4d3ac76e72b3fceab590f17 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:42:27 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 07:42:27 2012 -0800 |
tree | 905f2bf18e57b990f4fa840ba746dab7e349cd2f | |
parent | abc791fc5723bee48763a67a497ae25ac203b65b [diff] | |
parent | 16cb8655bd96cf32d192acd787d27504153a96ae [diff] |
am 16cb8655: Reconcile with jb-mr1-release - do not merge * commit '16cb8655bd96cf32d192acd787d27504153a96ae': JOP40F