tree 18c77dae409094b01c3c7f00cce57b0abddfa984
parent 1bcbf3593d41ee3cfa6c765129a701d76886bae1
parent d503fa85deaf4c14d27f45c1408ed13f302f36f4
author The Android Open Source Project <initial-contribution@android.com> 1365037525 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365037525 -0700

am d503fa85: Reconcile with jb-mr2-release - do not merge

* commit 'd503fa85deaf4c14d27f45c1408ed13f302f36f4':
  "JWR03"
  JWR02B
  "JWR02"