tree 079733b5737704eb57ef60854b91ec08f694b52a
parent e8186a2666b855dd6b90f9f244afbab4b8521bf3
parent 053f30bb2cb3fc9f974e37489075c8d8961a8d2e
author Jean-Baptiste Queru <jbq@google.com> 1363034665 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034665 -0700

am 053f30bb: am e6e38b08: am 49d89c07: (-s ours) am 31173957: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '053f30bb2cb3fc9f974e37489075c8d8961a8d2e':