tree 7abaf1d94d4622a342bd8feeccfb30e65722b51d
parent 0284a911ce75dfffca7befe7d647a12553fbaf53
parent 109b65d9d317ef81ffee58736c511e17757b154a
parent 109b65d9d317ef81ffee58736c511e17757b154a
author The Android Open Source Project <initial-contribution@android.com> 1337182872 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182872 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I701bd3cd419681dfb8836d19a323bfb47c53a298