am adf81367: (-s ours) am 43c15339: (-s ours) Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit 'adf813670802e515ec420e9b0ba0791fab95dd6f':
  DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
am c7fd4a5a: am 2bcdfe14: am 4651ee5d: am 7c7a8f02: Merge "Sort the results of findleaves again."

* commit 'c7fd4a5a7b33ca1ae528940e132fe301abe4fb61':
  Sort the results of findleaves again.
am 57afbd18: Merge "GPS Location Test Build Change"

* commit '57afbd18af79f1c29f7cdc65bb9ac0896bbafb96':
  GPS Location Test Build Change
am 9d78854f: Merge "Fix issue 5094017: Media server crashes on ISC emulator."

* commit '9d78854f0f36f3a209a45e3b9f99adcb0af82c94':
  Fix issue 5094017: Media server crashes on ISC emulator.
am ca94f358: Removing target-api option from build.

* commit 'ca94f3583f33bb8dc5243dcbb50738fff9f945d1':
  Removing target-api option from build.
am 6e41a748: Merge "Provide mechanism to override llvm-rs-cc headers."

* commit '6e41a7483aea711cb81c2223724c421468872803':
  Provide mechanism to override llvm-rs-cc headers.
am d7d096df: Tighten the toolchain version check

* commit 'd7d096df71c65cbcd35def83bdb4f7cc86c3f290':
  Tighten the toolchain version check
Add the default local_time hal implementation to builds.

Cherry-picked from master-tungsten:
    Change-Id: I93ee0702fd48e05f75af13d7529c80d3d5b2b2cd

Change-Id: Icbc86cb26023ac862ec524603b68de8951834b92
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
am e92f15a8: patch the /system/build.prop file last

* commit 'e92f15a85885de8db24b6f2ab536d25cf20a5ca5':
  patch the /system/build.prop file last
am 321ce5f8: Merge "resolved conflicts for merge of 6da54b6e to master"

* commit '321ce5f82079bc2ea80586bd5abc8250bc296ae0':
  emulator: Enable GLES emulation libraries
am 9a1dd170: am 3db43165: am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"

* commit '9a1dd17028d0259c799c7c81aa54c042324a29c7':
  sdk: add DLL_EXTENSION as an atree variable
am 45bee774: am a1b603a5: am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"

* commit '45bee774eb8c34df3b0e48557d17e28d78aada2a':
  x86: remove obsolete comments
am 5d8a5cee: Merge "Add filterfw.jar to standard list of java libraries to include."

* commit '5d8a5ceecb291b6ab6ba64f9e604db419fb81c8c':
  Add filterfw.jar to standard list of java libraries to include.
am 17a27047: Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks Collect some additional system image space, moving odex files to user partition on trygon-user

* commit '17a27047bb4d5f255b1c1c55864dae4425e9d6ee':
  Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks Collect some additional system image space, moving odex files to user partition on trygon-user
am b139b6a1: Calculate system image size at build, for harvesting later

* commit 'b139b6a1a550daa0df4e670ab3fa550be8204d2f':
  Calculate system image size at build, for harvesting later
am bdab41a1: Add image size calcuations into the script

* commit 'bdab41a16f63630672bde02af28d2e567578fb21':
  Add image size calcuations into the script
am 0a37a63a: Merge "Replace GalleryNew3D with Gallery2 in AOSP."

* commit '0a37a63a0e549a31a0a10ef50f4681dbbe3db045':
  Replace GalleryNew3D with Gallery2 in AOSP.
am 19b22a94: Remove pinyinIME

* commit '19b22a94132e3ef670d87a045afb64cfd00c13b6':
  Remove pinyinIME
main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: Id7f861d73288ef732473050d1d69b20fc7c5d7d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge "main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS" into ics-aah