Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2
* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2
* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
Merge commit '979d5567b72b4f3a8219b4786f9f512601645121' into eclair-mr2
* commit '979d5567b72b4f3a8219b4786f9f512601645121':
Add a cleanspec rule for the change to bump the API version to 5.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2
* commit '0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2
* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #2168428: STOP SHIP: Bump API version to 5
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
Merge commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-mr2
* commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit '69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair
* commit '69625548bf020685cdcb57dffe8f34aba80f11e5':
Bug in Mac build where it gets confused over case, fix no longer needed.
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-mr2
* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
Speed up warn.py about 30x by precompiling all the regular expressions.
Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-mr2
* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output. Threw in an AOSP copyright one-liner
for good measure.