"JLS36D"
"JLS36E"
"JLS36F"
JLS36G
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_build into cm-10.2
test: try syncing device tree from my repo

Change-Id: I3513a5e95162787fe1532d91d3e5be6b032da3c7
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/build into cm-10.2

Android 4.3 Release 3.1
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_build into cm-10.2
Merge branch 'DerTeufel/cm-10.2'

Conflicts:
	tools/roomservice.py