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 branch 'cm-10.2' of github.com:CyanogenMod/android_build into cm-10.2
ability to create fake-flash recoveries

Change-Id: I4f14cc31f15845aa6dfbd05b5dfd3284fa9bf44d
Merge branch 'DerTeufel/cm-10.2'

Conflicts:
	tools/roomservice.py