Merge commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed' into eclair-mr2-plus-aosp
* commit 'b4fe143cfe18022653fc6710ba44a8f19c6b17ed':
adding set wallpaper sample code in ApiDemos.
Merge commit '92fd5c635776f520ce09daf6681025a5f29aafbb' into eclair-mr2-plus-aosp
* commit '92fd5c635776f520ce09daf6681025a5f29aafbb':
Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '43bba677c9f8de4ad01c17387c56e9a1e91fa175' into eclair-mr2-plus-aosp
* commit '43bba677c9f8de4ad01c17387c56e9a1e91fa175':
add new Bluetooth sample app
Merge commit 'b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-mr2
* commit 'b5ad157bab0298535fa09378f6aca47029f9f475':
adding set wallpaper sample code in ApiDemos.
Merge commit '06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a' into eclair-mr2
* commit '06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a':
Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '67203cca65901d672803071bfc026c3657b85fdf' into eclair-mr2
* commit '67203cca65901d672803071bfc026c3657b85fdf':
add new Bluetooth sample app
Merge commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33'
* commit '97d2521e67df9ce745fa39a88ca3ec5bfe580d33':
Move some scripts that were in development/tools/scripts back in this project
Merge commit 'ac986b0d117a72482b8490a9c84b56d2c239da49'
* commit 'ac986b0d117a72482b8490a9c84b56d2c239da49':
Update sdk build to use the new folders in sdk/
Merge commit 'b06a8a0ca04d7900042410b4be0cf9cdfda24f18' into eclair-mr2-plus-aosp
* commit 'b06a8a0ca04d7900042410b4be0cf9cdfda24f18':
Move some scripts that were in development/tools/scripts back in this project
Merge commit '6be8bb5f2a3d59805419db427124ec0cca34c996' into eclair-mr2-plus-aosp
* commit '6be8bb5f2a3d59805419db427124ec0cca34c996':
Update sdk build to use the new folders in sdk/
Merge commit '5c52358c9b0a95adc0fe8b383289e7e522b2c421' into eclair-mr2
* commit '5c52358c9b0a95adc0fe8b383289e7e522b2c421':
Move some scripts that were in development/tools/scripts back in this project
Merge commit '86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-mr2
* commit '86cd8059dec97e2c1f1797d1e179719561d05162':
Update sdk build to use the new folders in sdk/
Merge commit '7271d15820302b982f1f704661ff78ac094096b5' into eclair-mr2-plus-aosp
* commit '7271d15820302b982f1f704661ff78ac094096b5':
Make Gesturebuilder build like a sample.
Merge commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2
* commit 'bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
Make Gesturebuilder build like a sample.
Merge commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4'
* commit '7bd364622b5204f46c9a7e4e9bc3692c755b7de4':
Add API demo for services that run in the foreground.
Merge commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605' into eclair-mr2-plus-aosp
* commit 'c46a762ee35b8630ed9f824e0627566fe7cfe605':
Add API demo for services that run in the foreground.
Merge commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c' into eclair-mr2-plus-aosp
* commit '4c95917590d1a992b7fe8f6e703353fdf5a0bf3c':
add one script to make release keys
Merge commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2
* commit 'eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
Add API demo for services that run in the foreground.
This script can replace the copies of mkkey.sh sprinkled all over the
tree. It prompts nicely for passwords, avoids writing the raw private
key to disk, and always generates certs that use sha1WithRSAEncryption.
Merge commit 'bd2ced1184a498fe5e6d93e780707e99971a0216'
* commit 'bd2ced1184a498fe5e6d93e780707e99971a0216':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Merge commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916'
* commit '621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
Refactoring the logging interface to remove dependence on NPP.
Merge commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded' into eclair-mr2-plus-aosp
* commit '51cce58c45591fdf3d0cd59a92aeb18182eaeded':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Merge commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc' into eclair-mr2-plus-aosp
* commit 'e62ce17ac9726d6c169d5378db6027b2d8a16fcc':
Refactoring the logging interface to remove dependence on NPP.