tree 8376117ede1f2870cec7de812f09ded53a28bd06
parent cb245b4ca20bf2a42d0cc4bcbb850b5e65bc028c
parent c7b3ba5e29241b9705939135104cdf9d6c8d6180
author Jean-Baptiste Queru <jbq@google.com> 1363034669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034669 -0700

am c7b3ba5e: am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c7b3ba5e29241b9705939135104cdf9d6c8d6180':