| commit | 2f86a384743fd3f608e8e65e4d5f5328a0aedfcb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:11:35 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 19:11:35 2012 -0700 |
| tree | 032805c718d50fa5083d1c2bc628d5d1c7d3c2b5 | |
| parent | 807a2f54f313caa5d7cba85a924de0ab6b830b66 [diff] | |
| parent | 60e5cd66bbee04d3d5771e085e8a73257ebff787 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I5602173e60967c0b027f926df862747b2cf1edde