| commit | ab0d4c8da18e1e36b17c81b664b9ddefb19e3e83 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Mar 05 21:16:32 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 21:16:32 2013 +0000 |
| tree | 56c40589e04ceb3a8e0891a423011251870d43c1 | |
| parent | 19b6b3695437e608e039c9e661825795817cdf92 [diff] | |
| parent | 4d8032b5e67e0a6a8929caaa1460716cd90dd04b [diff] |
am 4d8032b5: am f3b63ed1: am 67128cbc: (-s ours) am 18cd9793: (-s ours) am 84d3036c: (-s ours) am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4d8032b5e67e0a6a8929caaa1460716cd90dd04b':