Reconcile with nakasi-factoryrom-release

Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
This commit is contained in:
The Android Open Source Project 2012-05-29 09:41:02 -07:00
commit 65838c52fa

Diff Content Not Available