tree 7ec848fea8c09823a9734d3907e5cb13aaa412c4
parent bba1ede5fb2a091728c5422dbe1e3b35744e0515
parent 4ff7285658464bbc1e19b76b4f6d2bf650eb7cd6
author Jean-Baptiste Queru <jbq@google.com> 1363032052 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032052 -0700

am 4ff72856: am 93629338: (-s ours) am 12641e93: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4ff7285658464bbc1e19b76b4f6d2bf650eb7cd6':