Reconcile with jb-mr1-release - do not merge

Change-Id: I7653d40dbf6b2435b5681edd20cf763460422d57
This commit is contained in:
The Android Open Source Project 2012-10-03 07:35:19 -07:00
commit 4a1a8c6ae7

Diff content is not available