Merge commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2'
* commit 'ed52a500e34c3c9debd221986cdc89f1c83ce4d2':
Only apply permission to files with +x (do not merge)
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
Merge commit '192d5db1fedef99404644256f80740bb3763b049' into eclair-mr2
* commit '192d5db1fedef99404644256f80740bb3763b049':
Only apply permission to files with +x
Merge commit 'a883d5af0639d5f8d4dd9529665e81896221e5be'
* commit 'a883d5af0639d5f8d4dd9529665e81896221e5be':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit '9403f1ce47b6d869bd2107781bfe0dfa1b02e908'
* commit '9403f1ce47b6d869bd2107781bfe0dfa1b02e908':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52'
* commit 'a20fa0d9398bfcd9b9b473a5040139e6ab0d6e52':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '7cb020a94773d7410e09cbc1743bfab80578f0e9' into eclair-mr2-plus-aosp
* commit '7cb020a94773d7410e09cbc1743bfab80578f0e9':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit '23e92c7d3187e8c29a02ef82c666b84380557eff' into eclair-mr2-plus-aosp
* commit '23e92c7d3187e8c29a02ef82c666b84380557eff':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081' into eclair-mr2-plus-aosp
* commit 'aa02f40c1b32eb43c6b340300e4e4719c4975081':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-mr2
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2
* commit 'aad90b62c73e6d44ed391fb24953021d0b45a768':
SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
Merge commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad' into eclair-mr2
* commit 'f7f145dc0443ffa396304c2547ff9c15638c4dad':
Fix the android launcher script to not force Java 1.5 on MacOS
Merge commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60' into eclair-plus-aosp
* commit '41c271bb20ca14031405bda11e9dfd4b7bbc8a60':
A sample application that demonstrates use of legacy and current contacts APIs.
The application provides two implementations for access to contacts, one based
on legacy API, the other based on the current API. The correct implementation
is chosen at runtime based on the version of the SDK.
Change-Id: Iae0bc8564be420ff504a5dc760b935630a7664e6
