am 65838c52: Reconcile with nakasi-factoryrom-release

* commit '65838c52fa47cd4b7adf2ca0c27ed26376acc6c5':
This commit is contained in:
The Android Open Source Project 2012-05-29 09:44:58 -07:00 committed by Android Git Automerger
commit db3164091e

Diff Content Not Available