Reconcile with jb-mr1-release - do not merge

Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911
This commit is contained in:
The Android Open Source Project 2012-11-27 07:33:15 -08:00
commit 257fef4308

Diff content is not available