Reconcile with jb-mr0-release

Change-Id: Icff9883db37162d72b2fb24f4d03ef09112a3149
This commit is contained in:
The Android Open Source Project 2012-07-19 08:41:48 -07:00
commit 76533ab592

Diff Content Not Available