tree 4b39b7332353a649daf9e5f795b278f48ee571fc
parent 3911886e854d31058e7d3a6e310e8eafd06c02e0
parent 63790dce7a791ef575ea80d69776324e15ecf701
author Jean-Baptiste Queru <jbq@google.com> 1363032833 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032833 -0700

am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63790dce7a791ef575ea80d69776324e15ecf701':