tree 48821d607dd5088e206086115203874dfa24788e
parent 60ed689447da99eb18a06895c4139c6dc31165d2
parent cc8aa2e130c6640116bd993f3313e639a96a3ff1
author Jean-Baptiste Queru <jbq@google.com> 1371188183 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371188183 -0700

am cc8aa2e1: (-s ours) am 87b319cb: am b3ce9346: am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cc8aa2e130c6640116bd993f3313e639a96a3ff1':