| commit | bf6b35bf68bf5ffc0111c035aebbc720c32cf9c9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 12:48:47 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 12:48:47 2012 -0700 |
| tree | ef8b8eabeb29d0dd08c476a5788e4876691cd55e | |
| parent | 6ea43e3cf856d8c894513da84877fc124ef08be2 [diff] | |
| parent | 5ad242334a286bac445fb883ffbc8767cd9714d1 [diff] |
am 5ad24233: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5ad242334a286bac445fb883ffbc8767cd9714d1': (21 commits) JOO82 JOO81C JOO81B JOO81 JOO80C JOO80B JOO80 JOO79B JOO79 JOO78B JOO78 JOO76E JOO76D JOO76C JOO76B JOO76 JOO75B JOO75 JOO74D JOO74C ...