| commit | 4e28e5b871e7a4d67297ece485c87680ba0f6021 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:27:44 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:27:44 2012 -0700 |
| tree | 9db28a646f9edb3116918b322906a0e689bd405c | |
| parent | 7c51aad4fee8acd0cf835782da764b26f888e454 [diff] | |
| parent | 36f370905c7cc2d7a13ab3db748c75bf3fc7ff68 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic967f2cc0110dd1ceca4f30c552430bb57c03bb6