Merge commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c'
* commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c':
Update win_sdk to put binaries in SDK/platform-tools.
Merge commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd' into gingerbread-plus-aosp
* commit 'ff779c0f2a19985a9a6733d4864b4b56b20729bd':
Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/
SDK Bug: 2897406
Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
* Cleaned up extra whitespace & made vertical whitespace more consistent
* 100col wrap
* Remove unused imports
* Add @Override where necessary
Change-Id: I1ad404ffc4ce7fa9c4b661f7cc1783c86356316b
Also re-arrange all preference API demos to go in their own
package, since the preferfence APIs themselves are in their own package.
Change-Id: I305f77dc09748bb60d1de8a23d063db64c11bb1e
Includes changes to add CDD PDF and CTS ZIP to the
downloads page, and adds a blurb on the landing page in the "News" section.
Change-Id: I8fac5ceddec21df5c2d81794a3e1f7c92e89720e
Merge commit '7d3106bebbfe76a334567c59303a75897af915b2'
* commit '7d3106bebbfe76a334567c59303a75897af915b2':
Re-organize the SDK, moving the build tools out of the platforms.
Merge commit 'b86b7f72db1549cb526a141ca8b6158908483f1a' into gingerbread-plus-aosp
* commit 'b86b7f72db1549cb526a141ca8b6158908483f1a':
Re-organize the SDK, moving the build tools out of the platforms.
Merge commit 'd1314040fefdae9ebade02e2af072a3cf6e9d844'
* commit 'd1314040fefdae9ebade02e2af072a3cf6e9d844':
Separate platform files and samples by API level.
Merge commit 'f4790e6f9e47347996e62ecd27ff55b6499cf97a' into gingerbread-plus-aosp
* commit 'f4790e6f9e47347996e62ecd27ff55b6499cf97a':
Separate platform files and samples by API level.
Remove all duplicate platform files, i.e development/ndk/platforms/android-N now
only contains files that are introduced in API level 'N' and not found in level 'N-1'
(This makes it easier to manage independent platform release branches, and makes
platform additions trivial to examine and maintain).
Move samples that depends on features of API level 'N' into platforms/android-N/samples
+ update tests/run-all.sh accordingly
Change-Id: I04c4c67c6c674c1714d5812d461d0524a4f4cfd9
The command 'runtest --path <path to parent folder>'
is intended to find and build all tests contained within that parent folder.
However, the runtest logic was flawed in that it assumed building a parent
folder's Android.mk file would build all sub-directories.
This commit changes runtest to explictly look for the rule to build
sub-dir makefiles when creating the set of dirs to build.
Change-Id: Ia7f2172c1be79be8589be5f435fc4fb32569c994
Merge commit '8ddb2873df96c7181c9358f5c9286e273648bf89' into gingerbread-plus-aosp
* commit '8ddb2873df96c7181c9358f5c9286e273648bf89':
Change hosttestlib to use ddm-prebuilt.
Merge commit '255ee00edcb05e4477771f5de7351ada4a2ab6ce'
* commit '255ee00edcb05e4477771f5de7351ada4a2ab6ce':
Remove monkeyrunner so it can move to the SDK project.
Merge commit '32553f5291b1e0c5363db8bd7f280037f4f600e2' into gingerbread-plus-aosp
* commit '32553f5291b1e0c5363db8bd7f280037f4f600e2':
Remove monkeyrunner so it can move to the SDK project.
Merge commit 'b5ebc48565ceb23feba21cc12fbbb2cc34802209'
* commit 'b5ebc48565ceb23feba21cc12fbbb2cc34802209':
Update time zone data to the new version 2010k.
Merge commit 'cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9' into gingerbread-plus-aosp
* commit 'cc7fc9e839cee6c33d099a94c5bdb655bd83ccd9':
Update time zone data to the new version 2010k.
