Reconcile with jb-mr1-release - do not merge

Change-Id: Ic678a9ac8903330314ffcf430137c2873a34c4ce
This commit is contained in:
The Android Open Source Project committed 2012-10-03 07:35:00 -07:00
commit 4369a0dcc2

Diff Content Not Available