Reconcile with jb-release

Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1
This commit is contained in:
The Android Open Source Project 2012-05-22 13:06:34 -07:00
commit 7afcf63296

Diff Content Not Available