Merge commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327'
* commit 'fe8ab167caa0fb93d068a6f93932f9ce3115c327':
Clean step for the move of SearchableInfo to android.app
Merge commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0' into eclair-mr2-plus-aosp
* commit 'e15968b47a30fb6411a682ac06a5d93ea89011b0':
Clean step for the move of SearchableInfo to android.app
Merge commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a' into eclair-mr2-plus-aosp
* commit '56a01cbb5cc11bedeef2f033fc31e370c7401f4a':
don't add "ota-rel-keys" tag to build fingerprints
Merge commit 'e81271f526db01af84eabdd99d309c9425d3f1a3' into eclair-mr2
* commit 'e81271f526db01af84eabdd99d309c9425d3f1a3':
don't add "ota-rel-keys" tag to build fingerprints
Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp
* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
make build depend on event-log-tags file
Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp
* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
Change version to MR2 development.
Merge commit '80eaaa0c280daf7123241966223608bab40d236f'
* commit '80eaaa0c280daf7123241966223608bab40d236f':
Overwrite android-info instead of appending to it
Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)
For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
Merge commit 'cc6743007c416a4c19fa89d8c3088202bd456cc5' into eclair-mr2-plus-aosp
* commit 'cc6743007c416a4c19fa89d8c3088202bd456cc5':
Overwrite android-info instead of appending to it
Merge commit 'dc04cc892abfbd1405a44c90f3cbd72c7e040bd3' into eclair-mr2-plus-aosp
* commit 'dc04cc892abfbd1405a44c90f3cbd72c7e040bd3':
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
Merge commit '35b84b287f9cba2d098d28eb0e3b44abd6ae131a' into eclair-mr2
* commit '35b84b287f9cba2d098d28eb0e3b44abd6ae131a':
Overwrite android-info instead of appending to it
Merge commit '0706e6a4a3e6b80c11aae1648a3876c59929c48f' into eclair-mr2
* commit '0706e6a4a3e6b80c11aae1648a3876c59929c48f':
Tweak gettop() -- used in defining ANDROID_BUILD_TOP -- to expand symlinks.
Merge commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158'
* commit 'db8e83ecee6393f19c1d8adbb2ef3eb08b8e3158':
add 'extras' mechanism to OTA and signing tools
Merge commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28' into eclair-mr2-plus-aosp
* commit 'd816500cdd5ca4e017f2fe16fa9ec27205dc2e28':
add 'extras' mechanism to OTA and signing tools
Merge commit '8bec09ee7264160e4e08973a0efcc6bd2c898925' into eclair-mr2
* commit '8bec09ee7264160e4e08973a0efcc6bd2c898925':
add 'extras' mechanism to OTA and signing tools
Merge commit '600b4bb655e96655b769f390a17a85ad20fc15a5'
* commit '600b4bb655e96655b769f390a17a85ad20fc15a5':
only auto-generate board= requirement if a board-info file is not specified
Merge commit '8c1eeffe4339530cb76572588330a698bccb622c' into eclair-mr2-plus-aosp
* commit '8c1eeffe4339530cb76572588330a698bccb622c':
only auto-generate board= requirement if a board-info file is not specified
Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-mr2
* commit '2b80317be27e5450d7212b10777992d782dcf90e':
only auto-generate board= requirement if a board-info file is not specified
This makes runtest, in particular, happier, since it will now find that
its idea of the cwd actually matches with what's claimed in ANDROID_BUILD_TOP.
Change-Id: I485df382d9d314a73b410030bf2116215b6250f9
Merge commit 'b72e28f991b21535bfcb2ed59ead6ea9a318181c'
* commit 'b72e28f991b21535bfcb2ed59ead6ea9a318181c':
Add cleanspec to remove an old, historical package which
Merge commit '7e39fc235185abd445f43674431b5796d3965bdd' into eclair-mr2-plus-aosp
* commit '7e39fc235185abd445f43674431b5796d3965bdd':
Add cleanspec to remove an old, historical package which