commit | 259156444c5ecb63ce12e6911c2ee92ac9deb15e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:10:29 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:10:29 2012 -0700 |
tree | aeef5a56e741fd258f600a896a6e1973228e6a4e | |
parent | f2e3e8991739beb58aab6fa919434d641a52c063 [diff] | |
parent | 396efde6dabd649fce7562a281b991128eb49c73 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ica4f7fbb23b13d145c11f1e58fdd68011b435ee3