commit | b2f75a1294e45c47b5b961e3c22a0d0fb28615b1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:33:37 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:33:37 2012 -0800 |
tree | 49527580cddef220ae7e6dfe7726d999ae034c7d | |
parent | 91131f8bf2be0252cee361fb3f36504951372e62 [diff] | |
parent | 5ae6544b2207a783c6e01c7cc87af22bf63568cc [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I0c6fd4c96a2f38dd895fcaa223c4c33ea2c5e32a