commit | d8e22f60b7a215be7a73dc4dc0605a18610aebc3 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:46 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:34:46 2012 -0700 |
tree | 1fa2dc02fbbf1016b364ce5cd5610595dea3b74c | |
parent | 7c59061a8bdf3450d187ce958444b04067ab72f6 [diff] | |
parent | 3d266f898e7fcdaea60df1cb822d6a239c700268 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Iaf9173c88979b8cb2a62bc6d81be60886bbbfd80