| commit | 0e17cf50a623f7ce200e0185b83450aa04b396f0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 07 07:56:43 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 07 07:56:43 2012 -0800 |
| tree | 6fa17226e85798f41332b1a624ce6869ae139cc4 | |
| parent | 1e8753e460b9cbd06998dc150754bd63713d0414 [diff] | |
| parent | 8b52194c2ca7db79ba4fe60f9ef802793481f415 [diff] |
am 8b52194c: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '8b52194c2ca7db79ba4fe60f9ef802793481f415':