tree ff34aed5a0a3287ac9cb73c2158cad8479caf603
parent 8b1264214b982bc7629b57ed812c2f643b802ff3
parent 7b6ec85db8c87d10e42ee2d0c404edcb4d1c093c
parent c9dd811bfa7926ca9127d93b4c1ec8217c2a1457
author The Android Open Source Project <initial-contribution@android.com> 1337875282 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1337875282 -0700

Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ia25e07058f5b7ac1f60650ab8835ad7fa0243dca