am ca75eaf0: am 62c12cc5: am 83c3110c: am 1818ea8a: Add dev settings to emulator.
am ca75eaf0: am 62c12cc5: am 83c3110c: am 1818ea8a: Add dev settings to emulator.

* commit 'ca75eaf06442d51be7eb1516400d52cf095af013':
  Add dev settings to emulator.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build