Reconcile with jb-mr1-release - do not merge

Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6
This commit is contained in:
The Android Open Source Project committed 2012-11-01 07:52:31 -07:00
commit c8a5ea6651

Diff Content Not Available