am 227d45ea: Reconcile with jb-release nakasi-factoryrom-release

* commit '227d45ea2b9ccade09fd620d028e992ff1140b99':
This commit is contained in:
The Android Open Source Project 2012-05-24 09:04:10 -07:00 committed by Android Git Automerger
commit e718d80e73

Diff Content Not Available