| commit | f8a098631c0f1bd79e06e8de52f9545128d49d21 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:08:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:08:58 2012 -0700 |
| tree | 9db28a646f9edb3116918b322906a0e689bd405c | |
| parent | 7c51aad4fee8acd0cf835782da764b26f888e454 [diff] | |
| parent | 4e28e5b871e7a4d67297ece485c87680ba0f6021 [diff] |
am 4e28e5b8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4e28e5b871e7a4d67297ece485c87680ba0f6021':