commit | f9cf347965f77f666af1d291d6387d18a9eac709 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:53 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:17:53 2012 -0700 |
tree | 1a324730e93109975022e2d300f3186a886ee9e7 | |
parent | 7bfc7aafbbee01a6c18befa4f44c022b45e64705 [diff] | |
parent | 4cf7262f007e5ec35ca09cc91dc627ec19b33bc3 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ibf965c3ec5483b66da8d3b88f76e999b2b20a449