Reconcile with jb-mr0-release jb-release

Change-Id: Id8ba9e1858f97ba17d9f9b9080c0e18c0bebfa7b
This commit is contained in:
The Android Open Source Project 2012-07-19 08:35:48 -07:00
commit 2e5ae9873c

Diff content is not available