tree dcd56cea4ff5eb04ecb21f93975a62a2e95ef179
parent 10b432c35cf9b9c2abd0d5f484758bbedff5594f
parent 5502329d1d4b78d690087a3fc23f24e7b980ad0c
parent 37f3897b1a8936d432b9dcc270cdaefb5f2b1eff
author The Android Open Source Project <initial-contribution@android.com> 1337391837 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337391838 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ibfbde4f9437502df4a7580943f99ad13e427bdd5