commit | 818bd3b5ffdb4e450ab1a64b3ad8b5696fa4d650 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:17:38 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:17:38 2012 -0700 |
tree | 201b92a359e5660955cc77e052296b8fc3e00d4a | |
parent | 62643b76ce6b6a6c58f8bc6b9c624817829a1d1d [diff] | |
parent | 0c958246b0a4cbb6561740615f173b54e0e47d00 [diff] |
am 0c958246: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '0c958246b0a4cbb6561740615f173b54e0e47d00': (49 commits) JOP30C JOP30B JOP30 JOP29 JOP26B JOP26 JOP24G JOP24F JOP24E JOP24D JOP24C JOP24B JVP15S JOP24 JOP23E JOP23D JVP15R JOP23C JVP15Q JOP23B ...