| commit | de24d83f0e4aeb0f9cf2517c3705078053ec1a4d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 06 13:28:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 06 13:28:58 2012 -0700 |
| tree | 7f1f9ad0a92c7cf2c9f2fa2f9a2a797fc8861786 | |
| parent | 3df086824c79cdc52e1e68269c1c7b21ced3d82c [diff] | |
| parent | 447e392b6036aa9fcb9427782ab249921def8fc2 [diff] |
am 447e392b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '447e392b6036aa9fcb9427782ab249921def8fc2':