tree 0814e90f6d8f47ddad58fe75684384c864ba652c
parent 69f4b6732ce13f248b0da0c7eeda56207fdeaba2
parent 0c0efa0285301d1d50f5151b1c3fc74952f9dda1
parent 0c0efa0285301d1d50f5151b1c3fc74952f9dda1
author The Android Open Source Project <initial-contribution@android.com> 1337182797 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182797 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b