Reconcile with jb-mr0-release

Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310
This commit is contained in:
The Android Open Source Project 2012-07-27 14:53:36 -07:00
commit aeec25dabd

Diff content is not available