JDQ39B
JDQ39C
JDQ39D
JDQ39E
bring back assert in updater-script

why as it ever removed, this surely does nothing but good?
Revert "bring back assert in updater-script"

Thanks for nothing MATTMAN

This reverts commit 3d72189e94b2880b88121ef6dc8c1acc9032bdf5.
Fix bluetooth?
Revert "Revert "bring back assert in updater-script""

This reverts commit 6b7987df80bbf8528dbb59b53b2fcd7b18f53c08.

Derek, Fix the issue instead of reverting? Only missing a "'" :)
Fix the small error
Not jus treverting it :p
Add CARBON_VERSION in lunch output.
Fix the real issue.

Revert "Fix the small error"

This reverts commit fbdec8c1335c1a0636a6cc5f10e779b56af30933.

Revert "Revert "Revert "bring back assert in updater-script"""

This reverts commit 9072ef470b38fce93d8fcdb3ddce6745b4d13503.
Lets add some flare
Revert "Lets add some flare"

This reverts commit 0a6a2099fd77ad6ee2594ee254c868805cabeb13.
Lets get real flo$$y
Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/build into jb2

Android 4.2.2 release 1.2
I don't know what flossy means, but this is better.
Typo?
Merge pull request #2 from MrBaNkS/jb2

Typo?
Add more languages

Use this mk file to modify languages.
Saves us the trouble of updating devices individually
[1/3] Install persistence support

Copy files from OUT/install to ZIP/install and extract to /tmp/install
at install time.  This is an extensible framework that may be used for
other install tasks as needed.  Note that none of the install files are
only extracted to a ramdisk, they are never written to /system.

Run script persist.sh with argument "save" prior to formatting /system
and again with argument "restore" after /system is installed.  This may
be explicitly disabled by setting "TARGET_DISABLE_PERSIST := true".

Change-Id: I8b3b298e3c43b31aa275c3cb5d2eeae4cd33760b

Conflicts:
	core/Makefile
	tools/releasetools/edify_generator.py
	tools/releasetools/ota_from_target_files