commit | 5ad242334a286bac445fb883ffbc8767cd9714d1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:34:55 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:34:55 2012 -0700 |
tree | bdb41115ceeaf2b667dec9e8e8b38a0837e7fcbe | |
parent | 61ff681bb2791479ff54de33732e4351db5328d4 [diff] | |
parent | cd22a00c090f3f701cdc96dcaccb8e91706281fc [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I2574f76e658ad480d22c600a6e1e4f7b251a1749