| commit | d8b558b21d7155199d054f5822766ab25a18b3da | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Dec 11 11:57:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 11 11:57:08 2012 -0800 |
| tree | 9d6bbcfd4d36a610389e929ddcc9dfa06bed6ef9 | |
| parent | 086ec8d03c06e0b8a1a9073ed741e7e2d1705107 [diff] | |
| parent | 5185a003d02fbcfb78b0a8a83932aac7ab27e6d8 [diff] |
am 5185a003: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '5185a003d02fbcfb78b0a8a83932aac7ab27e6d8':