tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent 023dddfb4dd995dc8874a3667d42f728fa460e30
parent 87b319cb9673bf32c0f1c69ad70211ae6b248425
author Jean-Baptiste Queru <jbq@google.com> 1371188086 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371188086 -0700

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

* commit '87b319cb9673bf32c0f1c69ad70211ae6b248425':