tree 26c3824cf6d972e1c3a20343deacc1bc99d5f9b1
parent c5cd2c6ddb9cfdb7938c46362682fc41fd2e9ab1
parent f7e5c424080c75e003115aa248c90468c0b9b00a
author Jean-Baptiste Queru <jbq@google.com> 1366236502 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366236502 -0700

am f7e5c424: Reconcile with mr1.1-release

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