Merge commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1' into eclair-mr2-plus-aosp
* commit 'a04b9614ce35fe22e99c0bb765084a0d8e3af3f1':
create a test app that allows direct control of a sync adapter for testing purposes
Merge commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9' into eclair-mr2-plus-aosp
* commit 'c0446aa9d2b6610dd3d92611c0c0867e960198d9':
Moved values into attributes of xml elements where they belong
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-mr2
* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes
Merge commit 'b57238690e7e4afa66416e3ad25183a576f35075' into eclair-plus-aosp
* commit 'b57238690e7e4afa66416e3ad25183a576f35075':
create a test app that allows direct control of a sync adapter for testing purposes
Merge commit '4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp
* commit '4e97e5da372f1be39e9eeccc9cad7a551c164828':
Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-mr2
* commit '421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '421e8d3353de606444e5350d8feeee8c01c90394' into eclair-plus-aosp
* commit '421e8d3353de606444e5350d8feeee8c01c90394':
Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair
* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
Ignore hidden files and vi swap files during packaging. (do not merge)
SDK SAMPLE CODE ONLY
Before, the _id column in the search suggestions contained
a string. This causes an exception when the suggestion provider
is used for in-app search in Cupcake. Now the _id column contains
a long instead.
Fixes http://b/issue?id=2219970
Change-Id: I53c8228badbb0e3ff1799107490b44ff8ced7148
Merge commit '80de953874fd16dae6c89a2949e2fd5a14c1303f' into eclair-mr2-plus-aosp
* commit '80de953874fd16dae6c89a2949e2fd5a14c1303f':
Fix bug where monkey always tries to run multiple scripts.
Merge commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0' into eclair-mr2-plus-aosp
* commit '0136501f88c2e5181d9bf60c5d71fdc4696361c0':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
- Remove reference to ADT from sdklib tests.
- Move ADT test data to be closer to their test classes, and to make it obvious
this data is only for ADT unit tests.
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-plus-aosp
* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '03684b9d88cfa8f9775685d7a4efed2c96a57932' into eclair-mr2
* commit '03684b9d88cfa8f9775685d7a4efed2c96a57932':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7' into eclair
* commit '4bf2ce27a00c564daf0831c16769ee1ca259ddc7':
SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scripts
Merge commit '093d9020e4569c499d6e0094183fc3a90542404d' into eclair-mr2-plus-aosp
* commit '093d9020e4569c499d6e0094183fc3a90542404d':
click OK to toggle between demos
Merge commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp
* commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
Move check for hidden files in the proper method.
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-plus-aosp
* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Merge commit 'f9e0b264422d086066a9d9deb2118617735e8d65' into eclair-mr2
* commit 'f9e0b264422d086066a9d9deb2118617735e8d65':
Move check for hidden files in the proper method.
Merge commit 'a3dce5a089e64ac0e52405ae34560392d360e964' into eclair-mr2-plus-aosp
* commit 'a3dce5a089e64ac0e52405ae34560392d360e964':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-mr2
* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '8d700bdf67681ad405819c06906325768f8cf9ea' into eclair-plus-aosp
* commit '8d700bdf67681ad405819c06906325768f8cf9ea':
SDK: fix build. checkFileForPackaging is used by ApkBuilder.
Merge commit '35d140afb413e52f0ed43e30d41050348688f2e2' into eclair-mr2-plus-aosp
* commit '35d140afb413e52f0ed43e30d41050348688f2e2':
Ignore hidden files and vi swap files during packaging.
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-plus-aosp
* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2
* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
Ignore hidden files and vi swap files during packaging.
Merge commit '56af356a420bb6329cf309d7ad972f8441fd911c' into eclair-mr2-plus-aosp
* commit '56af356a420bb6329cf309d7ad972f8441fd911c':
Remove calendar provider suite from continuous. DO NOT MERGE
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-plus-aosp
* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
Merge commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538' into eclair-mr2
* commit 'a9982898b33399ddeee1e97f5f0d18c77ec1d538':
Remove calendar provider suite from continuous. DO NOT MERGE
Merge commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f' into eclair-mr2-plus-aosp
* commit 'fd2d528e36b4a47fc18f4a2e90985a5c17f8ad4f':
Create way to run monkey with multiple scripts.
Merge commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517' into eclair-mr2-plus-aosp
* commit 'dd43447bb22ffcbd7b09706b0ca101a7cdfba517':
Only apply permission to files with +x (do not merge)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-mr2
* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
Only apply permission to files with +x (do not merge)
Merge commit '208c75697e483f63f6075f28c1fc4ff49382f884' into eclair-plus-aosp
* commit '208c75697e483f63f6075f28c1fc4ff49382f884':
Only apply permission to files with +x (do not merge)
Merge commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92' into eclair
* commit '0dd85d89fa90de0d79da296292f75ceb5cf48b92':
Only apply permission to files with +x (do not merge)
Merge commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a' into eclair-mr2-plus-aosp
* commit '99906d6e17e85c36ba5e6fff98c66f852af33a9a':
Only apply permission to files with +x
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-plus-aosp
* commit '192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
