| commit | 3de5c8e785254edea2fe8aa5e6b1f68505795b8f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 08 15:42:07 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 08 15:42:07 2013 -0800 |
| tree | 072b850e29d78c8147dfb8644a2ae8f3229367a9 | |
| parent | 6c506a8716fa495c0611beaa5ad0acee15689d04 [diff] | |
| parent | ac9504090608247c739a3833cebf91cc21d44483 [diff] |
am ac950409: (-s ours) Reconcile with jb-mr1.1-release - do not merge # By The Android Automerger # Via The Android Automerger (3) and The Android Open Source Project (1) * commit 'ac9504090608247c739a3833cebf91cc21d44483': JDQ39 JDQ38