tree a59a5f7d3c49b87a253ccb0571d2064841efb5f9
parent b7eeeccd7877e1b3db61dea306d710bb0d7f1ba5
parent 9067a62a4821a476b2e02a7588bb87fb5d505f27
author Jean-Baptiste Queru <jbq@google.com> 1363030107 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030107 -0700

am 9067a62a: (-s ours) am de97f9c2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9067a62a4821a476b2e02a7588bb87fb5d505f27':