tree 0abd4712011831ca26a514f9f6e1238a24377cd1
parent a3845dd9a4aafa8e72e4a383de7a71291af1d464
parent 5cb3ac0af7dc20299166992f1b5e462f8e9a83e2
author Jean-Baptiste Queru <jbq@google.com> 1363035108 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363035108 +0000

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':