am d19750e8: (-s ours) am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp

* commit 'd19750e87f454507a9cee01989416ffbd14ea3f5': (23 commits)
  sdk-addon.mk: Copy image files to ABI-specific dir
  emulator: Enable dex-preoptimization
  sdk: provide ABI-dependent atree files
  emulator: Build emulator platform images as ARMv7-A
  x86: Add proper gcc-4.4.3 x86 toolchain support.
  sdk: Add pc-bios files for IA qemu emulator
  x86: qemu emulator is the default build target
  Add full_x86 product.
  x86: sdk_x86 build target
  Minor cleanup - DO NOT MERGE
  Clean up full config - DO NOT MERGE
  Make a full list of locales available
  Truly default to the full config.
  generic_x86 builds don't need/use the sparse ext4 format.
  Use ext4 file system for generic_x86 userdata partition
  GB Updates for init.rc and boot command line
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
  Display the TARGET_ARCH_VARIANT
  Add generic_x86-eng to the lunch menu
  Move buildspec vars to BoardConfig.mk
  ...
This commit is contained in:
David 'Digit' Turner 2011-07-13 14:53:40 -07:00 committed by Android Git Automerger
commit a576286228

Diff Content Not Available