| commit | 607ed610b3faac9c5c3521cdac7d9db4ec99b756 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 00:32:59 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 00:32:59 2012 -0700 |
| tree | 627dd668946641a544f60ecbc593309556caf8ec | |
| parent | 5891b13e677c67b85d01eb26bf8db460bae3760f [diff] | |
| parent | 863474b4a1a118d1d9181cf46f3466ccd0efa6b2 [diff] |
am 863474b4: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '863474b4a1a118d1d9181cf46f3466ccd0efa6b2':