| commit | 06a9e61da469eaab7384b47f3a0c2f900b606dca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 06 09:13:59 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 06 09:13:59 2013 -0800 |
| tree | 1c645bce5a5524398a53f59096dc8faca99004f3 | |
| parent | 1151ef4f853d9425768e1a997439b8e1cead4ccf [diff] | |
| parent | 15476e83b7f711ad9a4f5d9e33efe4e194f94df6 [diff] |
am 15476e83: (-s ours) Reconcile with jb-mr1.1-release - do not merge # By The Android Automerger # Via The Android Automerger (1) and The Android Open Source Project (1) * commit '15476e83b7f711ad9a4f5d9e33efe4e194f94df6': JDQ36B