| commit | 2f5bdd7a488f768a576e08bc7a59d97996ccc7b4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:20:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:20:50 2012 -0700 |
| tree | 58d89926d8aae6a71c2e8cf76acc542c302d44d1 | |
| parent | 618d4a9b9897dfa2cf8eaef7199f96e079794762 [diff] | |
| parent | 6260ced1bcb4b6e10022e33efb4c1767c49217e8 [diff] |
am 6260ced1: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '6260ced1bcb4b6e10022e33efb4c1767c49217e8':