| commit | 28275a7611ecdb079e8a8a2d63d2ee03f4f468e4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 02 07:30:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 02 07:30:22 2012 -0700 |
| tree | 235d3dbfedef2f430810e385904b288f4d8af991 | |
| parent | 144b27ecdc6a95ae55a1d09213c9f447420b4c04 [diff] | |
| parent | b24e661c66f1f75828f82a3e70a49ef93b2c434a [diff] |
am b24e661c: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b24e661c66f1f75828f82a3e70a49ef93b2c434a':