tree 1e33804c56a82cefe4dd183884e0019d7f1b02ab
parent 59ef364a8888ce8ec05d55f9093536ecf6d43aa6
parent 1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78
author Jean-Baptiste Queru <jbq@google.com> 1363032400 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032400 -0700

am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':