tree 257e3dcf4801f649618a44c453253c016d953903
parent a7c17deb32fe28230b77b0dff17bb113088a5c16
parent 4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad
author Jean-Baptiste Queru <jbq@google.com> 1363030920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030920 -0700

am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':