tree f2b436b2d058da22de6c88f1a3f2c2fa839adf89
parent 2fd0058c0204b60966a77265e75bfbc471416aa8
parent 438fa99e5c16a6a3f77cfc73771ff20421bbe9f2
author Jean-Baptiste Queru <jbq@google.com> 1363030920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030920 -0700

am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '438fa99e5c16a6a3f77cfc73771ff20421bbe9f2':