tree 96e26564bf7ea70729ec8584b0dca4bf6d4a2576
parent 5a478e277818def09b65a47a4d656cd24762bcf0
parent d61fe17fe45fb261534078d2fa8f2443ce5543f7
author Jean-Baptiste Queru <jbq@google.com> 1363034670 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034670 -0700

am d61fe17f: am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd61fe17fe45fb261534078d2fa8f2443ce5543f7':