tree 31f673ce2f4b49b340d6ef37e466a6c9a263ed68
parent f893f324710cde1cc5e0f551832692610ee4513c
parent d7ea7038239847ad1033012ff4a61b8e2e086f21
parent d7ea7038239847ad1033012ff4a61b8e2e086f21
author The Android Open Source Project <initial-contribution@android.com> 1337182874 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337182874 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Iba78ea27bcf56a64b7cbe9eae6d81291e6dd81e9