| commit | 05f409b61cb1ac0d33db6fc16ad126e441212260 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 16:31:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 16:31:38 2013 -0700 |
| tree | 58d67547af63f8cc23b92b414119a57383eaba36 | |
| parent | d40239e3d2b34f4109e831f28f1640998efb04a9 [diff] | |
| parent | 240f37715ec6eeeeca9b857cbbcf3a9e3037b17a [diff] |
am 240f3771: am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '240f37715ec6eeeeca9b857cbbcf3a9e3037b17a':