commit | 90b655315e9edcc6d253db0d06f829be55c7818e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 27 09:56:57 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 27 09:56:57 2012 -0700 |
tree | 4e4e43153ff7c0618ca4810d20abeacb48bc5b11 | |
parent | 0b366247acb2828caf105567efaaa219ad5563e4 [diff] | |
parent | edf8e122dd0c2a2481b110fa4a764c0b6db425b7 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib1b937c8a7adceaa522b13529b2b6ad4bb3726aa