tree fbfc1a9381c1a863c99e51cd858cb060f1f6f9ed
parent dac4a10064400bd396a209a4f7821cc66b7c3c6d
parent b7e2a77cd4764970ea95857e0935de4238148bfe
parent 07f10b684b71dbcf82636fc04344d48fdc97ff59
author The Android Open Source Project <initial-contribution@android.com> 1337182837 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182838 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1894c61b87d17afb56f564b36fda3b87a6b3f5a4