Reconcile with jb-mr1-release - do not merge

Change-Id: Ifbd9be57ffd54239f7d0b9271f262042394b938e
This commit is contained in:
The Android Open Source Project 2012-10-02 09:18:57 -07:00
commit 6f441d38d8

Diff content is not available