Reconcile with jb-mr1-release - do not merge

Change-Id: Ica5738e048a4cc24205e754276e2f4dc11102df6
This commit is contained in:
The Android Open Source Project 2012-08-22 15:36:34 -07:00
commit 0f84e5d2ec

Diff content is not available