tree 42b62f574c6d558506256987e19fbc22418eb63c
parent b8df1e0eb25a4e777c42800c8863d00bd3963177
parent 1c4878f5cad93446ddca803dfc99cb4ffd0a7a6b
parent 1c4878f5cad93446ddca803dfc99cb4ffd0a7a6b
author The Android Open Source Project <initial-contribution@android.com> 1337182826 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182826 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I1a745465e7631d3953d7be731bb164b317437dd6