am 2e5ae987: Reconcile with jb-mr0-release jb-release

* commit '2e5ae9873c4f62f90342cd042eff457c7e1103f0':
  JZO18
  JZO17
  JRO03H
  JRO03G
  JRO03F
  JRO03E
  JRO03D
  JZO11
  JZO10
This commit is contained in:
The Android Open Source Project 2012-07-19 08:52:00 -07:00 committed by Android Git Automerger
commit 39a7a7d9a8

Diff Content Not Available