tree 0da7e2c6f702cb3dda16573b08e3d15a2efd8559
parent 15a250bd2dd7fe70d29ca2f088a8d52d834ac598
parent 4825a957126bead9a482a75856909487c26ce00d
parent 4825a957126bead9a482a75856909487c26ce00d
author The Android Open Source Project <initial-contribution@android.com> 1337182866 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182866 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I4ae6aa33840d968c43fad23c3f5ee9f0d8a695d4