| commit | 3375751e1aebe775e4978ec66dee3f97f25e04f3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 20:51:48 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 20:51:48 2013 +0000 |
| tree | 0abd4712011831ca26a514f9f6e1238a24377cd1 | |
| parent | a3845dd9a4aafa8e72e4a383de7a71291af1d464 [diff] | |
| parent | 5cb3ac0af7dc20299166992f1b5e462f8e9a83e2 [diff] |
am 5cb3ac0a: (-s ours) am c5d9527e: am cc9002b1: am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '5cb3ac0af7dc20299166992f1b5e462f8e9a83e2':