tree 37c86da3588552d23f3a8678e9e6bcb2b541c583
parent d67cc366f769a84f56755b12d2c943113ec46f8c
parent 42b4c5083b168c6780b95e5c60b49655b049d56f
author Jean-Baptiste Queru <jbq@google.com> 1363031248 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363031248 -0700

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

* commit '42b4c5083b168c6780b95e5c60b49655b049d56f':