| commit | 3959dc590c6dd62e8fba5352fc00bf9bdc6922f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:52:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:52:40 2012 -0700 |
| tree | b19e65a133a1cb026e993d854f961166288aa8eb | |
| parent | 94df22ad34295c1e1198ecc53466e44471f8d4d0 [diff] | |
| parent | 3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332 [diff] |
am 3ccddf93: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332':