Reconcile with jb-mr1.1-release - do not merge

Change-Id: I66e912b35d44f05c4fdb6686bcde4a5396aa352d
This commit is contained in:
The Android Open Source Project 2012-11-28 09:47:11 -08:00
commit d457787f7a

Diff content is not available