am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B
This commit is contained in:
The Android Open Source Project
2012-11-12 07:28:31 -08:00
committed by Android Git Automerger

Diff Content Not Available