| commit | 9545c177b0acd56d1a1effcfef96fe0bbb4ead3e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:38:33 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 05 13:38:33 2013 -0800 |
| tree | 9937c7042320814deba0f2dd93e71fb1917e6c5e | |
| parent | ae54c554da618f0f5898db201740c07572584e77 [diff] | |
| parent | e22c8b7ec78c3c5ed0a42e331378c0ffc15d5c42 [diff] |
am e22c8b7e: (-s ours) Reconcile with jb-mr1.1-release - do not merge # Via The Android Automerger (3) and The Android Open Source Project (1) * commit 'e22c8b7ec78c3c5ed0a42e331378c0ffc15d5c42':