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

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

* commit '11ff695d526735306e1868b596212aac9f3239f4':