Reconcile with jb-mr1-release - do not merge

Change-Id: Ic3c4a57147bc3a4154c140beeeed27b5e3be9ece
This commit is contained in:
The Android Open Source Project 2012-10-31 09:19:05 -07:00
commit 10b8e684e1

Diff content is not available