Reconcile with jb-mr1-release - do not merge

Change-Id: I9082ae83604084d7999efcc4929bccfa34cb3765
This commit is contained in:
The Android Open Source Project committed 2012-10-04 07:49:37 -07:00
commit 917a07d8d2

Diff Content Not Available