Reconcile with jb-mr1-release - do not merge

Change-Id: I017b8998e27d05a8763bc2b301d17f8fe6a31a68
This commit is contained in:
The Android Open Source Project committed 2012-09-06 07:54:47 -07:00
commit 0afc1f60b1

Diff Content Not Available