am 0531d199: Reconcile with jb-mr1-release

* commit '0531d199dca9d70ccfd4642f845de02736ecf87f':
This commit is contained in:
The Android Open Source Project
2012-07-30 15:10:37 -07:00
committed by Android Git Automerger

Diff Content Not Available