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

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

* commit 'b25a2fcfae02ff802b81978ec82f0da8d2735d77':