am 754c4716: am fd31ee49: am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"
am 754c4716: am fd31ee49: am 6098579a: am 1ae6ae20: Merge "Don\'t use ADDR_COMPAT_LAYOUT on the emulator"

* commit '754c47164f8903521d3e46a8ad1f9961fde94040':
  Don't use ADDR_COMPAT_LAYOUT on the emulator

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base