am 1a37da3b: Reconcile with jb-mr1-release - do not merge

* commit '1a37da3bf44546f41734fd7ffdac066a256ea271':
This commit is contained in:
The Android Open Source Project
2012-11-07 11:37:20 -08:00
committed by Android Git Automerger

Diff Content Not Available