tree 8325186b61b3bf89ab3f7a3ce4951434c4aa4d15
parent cfd1a58237c5fe84ddd30c9a73dd361697060aed
parent 484bdcab1e7e64c2ad6ee36b9d216dbc94e82608
author Jean-Baptiste Queru <jbq@google.com> 1363034685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034685 -0700

am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '484bdcab1e7e64c2ad6ee36b9d216dbc94e82608':