| commit | 66cb819500c9e2667e472d14033e570422cb158b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:21:28 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:21:28 2012 -0800 |
| tree | 11dbf11873f68320e6bccb4e2c84ddc1c2b6a399 | |
| parent | 483a8796e8f0933f28065cefb8968519e77d8ef2 [diff] | |
| parent | 7c1c45e449aea9141bd8cebb88c5fba08c704623 [diff] |
am 7c1c45e4: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '7c1c45e449aea9141bd8cebb88c5fba08c704623':