commit | 17e06817a22f2a13baddec627dbf385d8799a604 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:18:55 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:18:55 2012 -0800 |
tree | 4ffa3d9c5bb05c59aa2324de213b7cc75600dbda | |
parent | d84f02944f78595c3f72eb7e8bc422c63bd6ce89 [diff] | |
parent | 81d04b7a6cd173c46f71cfbc788d3621a07d1e21 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc