tree 0bf20ac1b0298008b97bfe97517025945dde9baa
parent 9c27153999e516c1f08ddaa2109be0172202f44f
parent b81dc8414a80fc1cbd809609f212702bda36f449
author Jean-Baptiste Queru <jbq@google.com> 1366236807 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366236807 -0700

am b81dc841: am f7e5c424: Reconcile with mr1.1-release

* commit 'b81dc8414a80fc1cbd809609f212702bda36f449':
  This is JER09
  This is JER08
  JER05