commit | cda1948e611d7c3755902bc733f076f54a19e069 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:14 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:14 2012 -0700 |
tree | 0ffa5ba512ec22b2af06a69524d0bf089b3074ae | |
parent | bb7afa49893a68f2164c2b4e4708e2c21f30938f [diff] | |
parent | 10b8e684e1945edfb60ec4391ac4c7f3d8bf4172 [diff] |
am 10b8e684: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '10b8e684e1945edfb60ec4391ac4c7f3d8bf4172':