commit | 10b8e684e1945edfb60ec4391ac4c7f3d8bf4172 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:05 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:05 2012 -0700 |
tree | 0ffa5ba512ec22b2af06a69524d0bf089b3074ae | |
parent | 29e55ef83def8eaf6aa01201c6344a8037b2f780 [diff] | |
parent | 1cbe0ce40c523de48911fec2a94aec34e8ab14a3 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece