OSDN Git Service
Andrew Stadler [Thu, 10 Dec 2009 00:10:02 +0000 (16:10 -0800)]
resolved conflicts for merge of
e85c304f to master
Andrew Stadler [Wed, 9 Dec 2009 20:07:31 +0000 (12:07 -0800)]
resolved conflicts for merge of
fa3d6b54 to eclair-mr2-plus-aosp
Jack Palevich [Wed, 9 Dec 2009 07:32:35 +0000 (15:32 +0800)]
Simple Matrix Palette skinning sample.
Megha Joshi [Tue, 8 Dec 2009 22:52:03 +0000 (14:52 -0800)]
am
0a510b1f: am
0cf6092e: am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
0a510b1f704ac940cf3d166a4f139c1910db1677'
* commit '
0a510b1f704ac940cf3d166a4f139c1910db1677':
Add QuickContactsBadge widget sample to ApiDemos
Marco Nelissen [Tue, 8 Dec 2009 22:51:04 +0000 (14:51 -0800)]
am
92f95ee3: am
bd642f3e: Make the simulator use alsa instead of esound.
Merge commit '
92f95ee3fb30ed86fb0b9e080551552448b511ae'
* commit '
92f95ee3fb30ed86fb0b9e080551552448b511ae':
Make the simulator use alsa instead of esound.
Owen Lin [Tue, 8 Dec 2009 02:30:14 +0000 (18:30 -0800)]
am
0a91a547: am
0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '
0a91a547ee32d559b7b737f69430d4d0732dfca9'
* commit '
0a91a547ee32d559b7b737f69430d4d0732dfca9':
Fix the camera preview demo.
Megha Joshi [Tue, 8 Dec 2009 01:03:40 +0000 (17:03 -0800)]
am
0cf6092e: am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
0cf6092e742fbf95722e596f0d4e808e87ac6ce2' into eclair-mr2-plus-aosp
* commit '
0cf6092e742fbf95722e596f0d4e808e87ac6ce2':
Add QuickContactsBadge widget sample to ApiDemos
Android (Google) Code Review [Tue, 8 Dec 2009 00:59:07 +0000 (16:59 -0800)]
Merge change Ifc1b1ccb into eclair-mr2
* changes:
Fix eclipse build
Megha Joshi [Tue, 8 Dec 2009 00:59:00 +0000 (16:59 -0800)]
am
11d89599: Add QuickContactsBadge widget sample to ApiDemos
Merge commit '
11d89599ef7cf949bfe0048d1352f264ee0f6a34' into eclair-mr2
* commit '
11d89599ef7cf949bfe0048d1352f264ee0f6a34':
Add QuickContactsBadge widget sample to ApiDemos
Megha Joshi [Fri, 13 Nov 2009 19:45:19 +0000 (11:45 -0800)]
Add QuickContactsBadge widget sample to ApiDemos
Marco Nelissen [Tue, 8 Dec 2009 00:02:40 +0000 (16:02 -0800)]
am
bd642f3e: Make the simulator use alsa instead of esound.
Merge commit '
bd642f3e94f4cb94cbb48646ae61da5f6b18a093' into eclair-mr2-plus-aosp
* commit '
bd642f3e94f4cb94cbb48646ae61da5f6b18a093':
Make the simulator use alsa instead of esound.
David 'Digit' Turner [Mon, 7 Dec 2009 22:57:29 +0000 (14:57 -0800)]
am
cc3d3913: am
85f5c420: am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
cc3d39135124776ca2d36d6e973bc5b332fa9cbf'
* commit '
cc3d39135124776ca2d36d6e973bc5b332fa9cbf':
Fix toolchain scripts for Darwin and Cygwin.
Megha Joshi [Mon, 7 Dec 2009 22:56:59 +0000 (14:56 -0800)]
am
f1074892: am
2321ba48: am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
f10748929f7edcf142357d03bed5464964284fdb'
* commit '
f10748929f7edcf142357d03bed5464964284fdb':
Adding wallpaper sample in ApiDemos.
Marco Nelissen [Mon, 7 Dec 2009 22:53:55 +0000 (14:53 -0800)]
Marco Nelissen [Fri, 4 Dec 2009 23:50:25 +0000 (15:50 -0800)]
Make the simulator use alsa instead of esound.
Andrew Stadler [Mon, 7 Dec 2009 18:55:39 +0000 (10:55 -0800)]
Fix eclipse build
* Bring in auto-generated EventLogTags
Owen Lin [Mon, 7 Dec 2009 08:04:49 +0000 (00:04 -0800)]
am
0ee41ccc: Merge change I1558a070 into eclair-mr2
Merge commit '
0ee41ccc1429b83c6ab62cb99e081826a94741e8' into eclair-mr2-plus-aosp
* commit '
0ee41ccc1429b83c6ab62cb99e081826a94741e8':
Fix the camera preview demo.
Android (Google) Code Review [Mon, 7 Dec 2009 08:00:07 +0000 (00:00 -0800)]
Merge change I1558a070 into eclair-mr2
* changes:
Fix the camera preview demo.
David 'Digit' Turner [Sat, 5 Dec 2009 02:31:25 +0000 (18:31 -0800)]
am
85f5c420: am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
85f5c42069ab6ae90d1ed1c04f22a7b42407e55d' into eclair-mr2-plus-aosp
* commit '
85f5c42069ab6ae90d1ed1c04f22a7b42407e55d':
Fix toolchain scripts for Darwin and Cygwin.
David 'Digit' Turner [Sat, 5 Dec 2009 02:27:05 +0000 (18:27 -0800)]
am
e8d64956: Merge change I6b913ab8 into eclair
Merge commit '
e8d649561a6dbc6e0260d4b24049c00d23e7285b' into eclair-mr2
* commit '
e8d649561a6dbc6e0260d4b24049c00d23e7285b':
Fix toolchain scripts for Darwin and Cygwin.
Android (Google) Code Review [Sat, 5 Dec 2009 02:22:21 +0000 (18:22 -0800)]
Merge change I6b913ab8 into eclair
* changes:
Fix toolchain scripts for Darwin and Cygwin.
David 'Digit' Turner [Sat, 5 Dec 2009 01:57:36 +0000 (17:57 -0800)]
Fix toolchain scripts for Darwin and Cygwin.
Only touches download-toolchain-sources.sh and build-toolchain.sh
This does not impact the NDK build scripts themselves and is only
needed to properly package NDK release packages.
Megha Joshi [Sat, 5 Dec 2009 01:10:40 +0000 (17:10 -0800)]
am
2321ba48: am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83' into eclair-mr2-plus-aosp
* commit '
2321ba48baed1638a71ec8c7b1d6f9d79e3e9f83':
Adding wallpaper sample in ApiDemos.
Megha Joshi [Sat, 5 Dec 2009 01:06:39 +0000 (17:06 -0800)]
am
b49dd835: Adding wallpaper sample in ApiDemos.
Merge commit '
b49dd8359d1b23eb527139499c0db58cb01466c6' into eclair-mr2
* commit '
b49dd8359d1b23eb527139499c0db58cb01466c6':
Adding wallpaper sample in ApiDemos.
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
Adding wallpaper sample in ApiDemos.
Marco Nelissen [Fri, 4 Dec 2009 22:48:27 +0000 (14:48 -0800)]
am
ac2a5cf7: Fix fake timing.
Merge commit '
ac2a5cf7e45a2fa7936119517e4f52517b9d5747' into eclair-mr2-plus-aosp
* commit '
ac2a5cf7e45a2fa7936119517e4f52517b9d5747':
Fix fake timing.
Marco Nelissen [Fri, 4 Dec 2009 22:44:43 +0000 (14:44 -0800)]
Fix fake timing.
Scott Main [Fri, 4 Dec 2009 12:31:44 +0000 (04:31 -0800)]
am
768421da: am
2eaa8880: am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
768421daf5745fb47a9f0ce7fa95a0f28170b210'
* commit '
768421daf5745fb47a9f0ce7fa95a0f28170b210':
change BT sample minsdkversion to 6 because it
Andrew Stadler [Fri, 4 Dec 2009 12:31:13 +0000 (04:31 -0800)]
am
f9c2e07d: am
21b8dbe5: Merge change Ia8c35b58 into eclair-mr2
Merge commit '
f9c2e07d2cb65271d8def8d5562ecba52f69fd91'
* commit '
f9c2e07d2cb65271d8def8d5562ecba52f69fd91':
Track library changes
Jean-Baptiste Queru [Fri, 4 Dec 2009 12:29:50 +0000 (04:29 -0800)]
am
394ef56d: am
aecf2c65: am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
394ef56df8af1e569458f6159ce79b055bb846ef'
* commit '
394ef56df8af1e569458f6159ce79b055bb846ef':
Revert "adding set wallpaper sample code in ApiDemos."
Megha Joshi [Fri, 4 Dec 2009 12:29:45 +0000 (04:29 -0800)]
Megha Joshi [Fri, 4 Dec 2009 12:22:09 +0000 (04:22 -0800)]
Megha Joshi [Fri, 4 Dec 2009 12:22:02 +0000 (04:22 -0800)]
am
39248181: am
b4fe143c: am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
392481816eec1869345031d1600251dea8fba275'
* commit '
392481816eec1869345031d1600251dea8fba275':
adding set wallpaper sample code in ApiDemos.
Xavier Ducrohet [Fri, 4 Dec 2009 12:21:56 +0000 (04:21 -0800)]
am
93a523b5: am
92fd5c63: am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
93a523b54fc45918c43e622c7c8bf06da26f7e73'
* commit '
93a523b54fc45918c43e622c7c8bf06da26f7e73':
Move source prop files for docs/platforms/usb driver back into dev.
Scott Main [Fri, 4 Dec 2009 12:21:49 +0000 (04:21 -0800)]
Scott Main [Fri, 4 Dec 2009 02:24:44 +0000 (18:24 -0800)]
am
2eaa8880: am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
2eaa8880f076ebd0db36de81f9feaf34bd571df3' into eclair-mr2-plus-aosp
* commit '
2eaa8880f076ebd0db36de81f9feaf34bd571df3':
change BT sample minsdkversion to 6 because it
Scott Main [Fri, 4 Dec 2009 02:14:59 +0000 (18:14 -0800)]
am
c5a640ee: Merge change Icce4f510 into eclair
Merge commit '
c5a640ee3aba8c3215a769a11492a4dc8d82bd72' into eclair-mr2
* commit '
c5a640ee3aba8c3215a769a11492a4dc8d82bd72':
change BT sample minsdkversion to 6 because it
Android (Google) Code Review [Fri, 4 Dec 2009 02:07:52 +0000 (18:07 -0800)]
Merge change Icce4f510 into eclair
* changes:
change BT sample minsdkversion to 6 because it uses the revised result codes when enabling BT
Scott Main [Fri, 4 Dec 2009 01:59:47 +0000 (17:59 -0800)]
change BT sample minsdkversion to 6 because it
uses the revised result codes when enabling BT
Andrew Stadler [Fri, 4 Dec 2009 01:05:38 +0000 (17:05 -0800)]
am
21b8dbe5: Merge change Ia8c35b58 into eclair-mr2
Merge commit '
21b8dbe5c4f657f673bae2b1ad298f91465616d2' into eclair-mr2-plus-aosp
* commit '
21b8dbe5c4f657f673bae2b1ad298f91465616d2':
Track library changes
Android (Google) Code Review [Fri, 4 Dec 2009 01:00:05 +0000 (17:00 -0800)]
Merge change Ia8c35b58 into eclair-mr2
* changes:
Track library changes
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:57:41 +0000 (16:57 -0800)]
am
aecf2c65: am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
aecf2c6581228677e90550a6d8f5f9668fb72987' into eclair-mr2-plus-aosp
* commit '
aecf2c6581228677e90550a6d8f5f9668fb72987':
Revert "adding set wallpaper sample code in ApiDemos."
Megha Joshi [Fri, 4 Dec 2009 00:53:33 +0000 (16:53 -0800)]
am
f6d9c9d4: am
eb34b45e: Revert "fixing build"
Merge commit '
f6d9c9d427c70017757dcddf5b396de2d5f2f33d' into eclair-mr2-plus-aosp
* commit '
f6d9c9d427c70017757dcddf5b396de2d5f2f33d':
Revert "fixing build"
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:43:32 +0000 (16:43 -0800)]
am
76c9d31c: Revert "adding set wallpaper sample code in ApiDemos."
Merge commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a' into eclair-mr2
* commit '
76c9d31ce383cf1f4ef89dd1dae4f751fbb73b9a':
Revert "adding set wallpaper sample code in ApiDemos."
Megha Joshi [Fri, 4 Dec 2009 00:42:00 +0000 (16:42 -0800)]
Megha Joshi [Fri, 4 Dec 2009 00:41:05 +0000 (16:41 -0800)]
am
b4fe143c: am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
b4fe143cfe18022653fc6710ba44a8f19c6b17ed' into eclair-mr2-plus-aosp
* commit '
b4fe143cfe18022653fc6710ba44a8f19c6b17ed':
adding set wallpaper sample code in ApiDemos.
Jean-Baptiste Queru [Fri, 4 Dec 2009 00:35:23 +0000 (16:35 -0800)]
Revert "adding set wallpaper sample code in ApiDemos."
This reverts commit
b5ad157bab0298535fa09378f6aca47029f9f475.
Xavier Ducrohet [Fri, 4 Dec 2009 00:34:13 +0000 (16:34 -0800)]
am
92fd5c63: am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
92fd5c635776f520ce09daf6681025a5f29aafbb' into eclair-mr2-plus-aosp
* commit '
92fd5c635776f520ce09daf6681025a5f29aafbb':
Move source prop files for docs/platforms/usb driver back into dev.
Megha Joshi [Fri, 4 Dec 2009 00:29:58 +0000 (16:29 -0800)]
am
eb34b45e: Revert "fixing build"
Merge commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd' into eclair-mr2
* commit '
eb34b45ef1d1c6ca6c4e4d3a303baf00234b7bbd':
Revert "fixing build"
Scott Main [Fri, 4 Dec 2009 00:28:34 +0000 (16:28 -0800)]
am
43bba677: am
67203cca: add new Bluetooth sample app
Merge commit '
43bba677c9f8de4ad01c17387c56e9a1e91fa175' into eclair-mr2-plus-aosp
* commit '
43bba677c9f8de4ad01c17387c56e9a1e91fa175':
add new Bluetooth sample app
Megha Joshi [Fri, 4 Dec 2009 00:16:52 +0000 (16:16 -0800)]
Revert "fixing build"
This reverts commit
7d1b833e7d1337e9ce85746886bafc98bcab16d8.
Andrew Stadler [Thu, 3 Dec 2009 23:35:07 +0000 (15:35 -0800)]
Track library changes
Fixes build errors in eclipse around CalendarProvider
Megha Joshi [Thu, 3 Dec 2009 23:23:37 +0000 (15:23 -0800)]
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
fixing build
Megha Joshi [Thu, 3 Dec 2009 22:17:55 +0000 (14:17 -0800)]
am
b5ad157b: adding set wallpaper sample code in ApiDemos.
Merge commit '
b5ad157bab0298535fa09378f6aca47029f9f475' into eclair-mr2
* commit '
b5ad157bab0298535fa09378f6aca47029f9f475':
adding set wallpaper sample code in ApiDemos.
Megha Joshi [Thu, 3 Dec 2009 21:56:04 +0000 (13:56 -0800)]
adding set wallpaper sample code in ApiDemos.
Xavier Ducrohet [Thu, 3 Dec 2009 19:50:21 +0000 (11:50 -0800)]
am
06ddeb0f: Move source prop files for docs/platforms/usb driver back into dev.
Merge commit '
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a' into eclair-mr2
* commit '
06ddeb0fbd7bd514b17fbb335d5e5e1eeb19397a':
Move source prop files for docs/platforms/usb driver back into dev.
Xavier Ducrohet [Thu, 3 Dec 2009 03:10:10 +0000 (19:10 -0800)]
Move source prop files for docs/platforms/usb driver back into dev.
Change-Id: I4632dc69432b720d586c84834f89c843a2eaf5cd
Scott Main [Thu, 3 Dec 2009 18:23:30 +0000 (10:23 -0800)]
am
67203cca: add new Bluetooth sample app
Merge commit '
67203cca65901d672803071bfc026c3657b85fdf' into eclair-mr2
* commit '
67203cca65901d672803071bfc026c3657b85fdf':
add new Bluetooth sample app
Xavier Ducrohet [Thu, 3 Dec 2009 04:37:50 +0000 (20:37 -0800)]
am
97d2521e: am
b06a8a0c: am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
97d2521e67df9ce745fa39a88ca3ec5bfe580d33'
* commit '
97d2521e67df9ce745fa39a88ca3ec5bfe580d33':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Thu, 3 Dec 2009 04:37:46 +0000 (20:37 -0800)]
am
ac986b0d: am
6be8bb5f: am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
ac986b0d117a72482b8490a9c84b56d2c239da49'
* commit '
ac986b0d117a72482b8490a9c84b56d2c239da49':
Update sdk build to use the new folders in sdk/
Xavier Ducrohet [Thu, 3 Dec 2009 04:30:05 +0000 (20:30 -0800)]
am
1d46eb30: am
7271d158: am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
1d46eb3093723d509e45d33f65676dc3fd8f0360'
* commit '
1d46eb3093723d509e45d33f65676dc3fd8f0360':
Make Gesturebuilder build like a sample.
Scott Main [Tue, 1 Dec 2009 07:20:55 +0000 (23:20 -0800)]
add new Bluetooth sample app
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:05 +0000 (13:13 -0800)]
am
b06a8a0c: am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
b06a8a0ca04d7900042410b4be0cf9cdfda24f18' into eclair-mr2-plus-aosp
* commit '
b06a8a0ca04d7900042410b4be0cf9cdfda24f18':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Wed, 2 Dec 2009 21:13:01 +0000 (13:13 -0800)]
am
6be8bb5f: am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
6be8bb5f2a3d59805419db427124ec0cca34c996' into eclair-mr2-plus-aosp
* commit '
6be8bb5f2a3d59805419db427124ec0cca34c996':
Update sdk build to use the new folders in sdk/
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:27 +0000 (13:05 -0800)]
am
5c52358c: Merge change I8404ae5f into eclair
Merge commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421' into eclair-mr2
* commit '
5c52358c9b0a95adc0fe8b383289e7e522b2c421':
Move some scripts that were in development/tools/scripts back in this project
Xavier Ducrohet [Wed, 2 Dec 2009 21:05:21 +0000 (13:05 -0800)]
am
86cd8059: Merge change Ia7f1d23e into eclair
Merge commit '
86cd8059dec97e2c1f1797d1e179719561d05162' into eclair-mr2
* commit '
86cd8059dec97e2c1f1797d1e179719561d05162':
Update sdk build to use the new folders in sdk/
Android (Google) Code Review [Wed, 2 Dec 2009 21:00:08 +0000 (13:00 -0800)]
Merge change I8404ae5f into eclair
* changes:
Move some scripts that were in development/tools/scripts back in this project
Android (Google) Code Review [Wed, 2 Dec 2009 20:59:48 +0000 (12:59 -0800)]
Merge change Ia7f1d23e into eclair
* changes:
Update sdk build to use the new folders in sdk/
Xavier Ducrohet [Wed, 2 Dec 2009 18:01:09 +0000 (10:01 -0800)]
am
7271d158: am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
7271d15820302b982f1f704661ff78ac094096b5' into eclair-mr2-plus-aosp
* commit '
7271d15820302b982f1f704661ff78ac094096b5':
Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 17:48:15 +0000 (09:48 -0800)]
am
bc9cac17: Make Gesturebuilder build like a sample.
Merge commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc' into eclair-mr2
* commit '
bc9cac171505afbf4ecdb5eabb849c98cac1bddc':
Make Gesturebuilder build like a sample.
Xavier Ducrohet [Wed, 2 Dec 2009 02:31:34 +0000 (18:31 -0800)]
Make Gesturebuilder build like a sample.
Change-Id: I42f097fbb46631de9bb088d7aeade971480c72ae
Dianne Hackborn [Wed, 2 Dec 2009 01:34:28 +0000 (17:34 -0800)]
am
7bd36462: am
c46a762e: am
eb3547b3: Add API demo for services that run in the foreground.
Merge commit '
7bd364622b5204f46c9a7e4e9bc3692c755b7de4'
* commit '
7bd364622b5204f46c9a7e4e9bc3692c755b7de4':
Add API demo for services that run in the foreground.
Doug Zongker [Wed, 2 Dec 2009 01:34:22 +0000 (17:34 -0800)]
am
c20e78e0: am
4c959175: add one script to make release keys
Merge commit '
c20e78e01526f550b3617aebef925b2eadfe1951'
* commit '
c20e78e01526f550b3617aebef925b2eadfe1951':
add one script to make release keys
Dianne Hackborn [Wed, 2 Dec 2009 01:24:06 +0000 (17:24 -0800)]
am
c46a762e: am
eb3547b3: 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.
Doug Zongker [Wed, 2 Dec 2009 01:24:00 +0000 (17:24 -0800)]
am
4c959175: add one script to make release keys
Merge commit '
4c95917590d1a992b7fe8f6e703353fdf5a0bf3c' into eclair-mr2-plus-aosp
* commit '
4c95917590d1a992b7fe8f6e703353fdf5a0bf3c':
add one script to make release keys
Dianne Hackborn [Wed, 2 Dec 2009 01:05:18 +0000 (17:05 -0800)]
am
eb3547b3: Add API demo for services that run in the foreground.
Merge commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7' into eclair-mr2
* commit '
eb3547b3d0678ad16a602d342cf81dc64e03d9b7':
Add API demo for services that run in the foreground.
Xavier Ducrohet [Tue, 1 Dec 2009 21:20:59 +0000 (13:20 -0800)]
Update sdk build to use the new folders in sdk/
Change-Id: Ia7f1d23e452b4b493dc4456f8fedd4dd3d2b006f
Xavier Ducrohet [Tue, 1 Dec 2009 21:03:49 +0000 (13:03 -0800)]
Move some scripts that were in development/tools/scripts back in this project
They were moved into sdk/scripts when sdk was split from development.
Change-Id: I8404ae5fdeb9060adb76357f29b42c4c8e2054ee
Doug Zongker [Tue, 1 Dec 2009 20:26:51 +0000 (12:26 -0800)]
add one script to make release keys
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.
Derek Sollenberger [Tue, 1 Dec 2009 17:14:50 +0000 (09:14 -0800)]
am
bd2ced11: am
51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.
Merge commit '
bd2ced1184a498fe5e6d93e780707e99971a0216'
* commit '
bd2ced1184a498fe5e6d93e780707e99971a0216':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 17:14:07 +0000 (09:14 -0800)]
am
621b6bfa: am
e62ce17a: Refactoring the logging interface to remove dependence on NPP.
Merge commit '
621b6bfad10237b0ed3fdcb31a141df1dd7b8916'
* commit '
621b6bfad10237b0ed3fdcb31a141df1dd7b8916':
Refactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Tue, 1 Dec 2009 14:13:40 +0000 (06:13 -0800)]
am
51cce58c: Ensure the plugin\'s native code is never called with an invalid NPP pointer.
Merge commit '
51cce58c45591fdf3d0cd59a92aeb18182eaeded' into eclair-mr2-plus-aosp
* commit '
51cce58c45591fdf3d0cd59a92aeb18182eaeded':
Ensure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 13:26:20 +0000 (08:26 -0500)]
Ensure the plugin's native code is never called with an invalid NPP pointer.
Derek Sollenberger [Tue, 1 Dec 2009 13:22:25 +0000 (05:22 -0800)]
am
e62ce17a: Refactoring the logging interface to remove dependence on NPP.
Merge commit '
e62ce17ac9726d6c169d5378db6027b2d8a16fcc' into eclair-mr2-plus-aosp
* commit '
e62ce17ac9726d6c169d5378db6027b2d8a16fcc':
Refactoring the logging interface to remove dependence on NPP.
Android (Google) Code Review [Tue, 1 Dec 2009 00:07:10 +0000 (16:07 -0800)]
Merge change Ifbc44116
* changes:
Add OpenGL ES 2.0 sample.
Derek Sollenberger [Mon, 30 Nov 2009 16:52:06 +0000 (11:52 -0500)]
Refactoring the logging interface to remove dependence on NPP.
Derek Sollenberger [Mon, 30 Nov 2009 15:59:58 +0000 (07:59 -0800)]
am
b6fd8a3f: am
04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Merge commit '
b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e'
* commit '
b6fd8a3fe7306b4d94ef7a11acb1d068e6e25d0e':
Refactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Mon, 30 Nov 2009 15:55:30 +0000 (07:55 -0800)]
am
04b3e9a6: Refactoring sample plugin to use updated java interfaces.
Merge commit '
04b3e9a6c6cf43887e9551ea1da7681f071b8696' into eclair-mr2-plus-aosp
* commit '
04b3e9a6c6cf43887e9551ea1da7681f071b8696':
Refactoring sample plugin to use updated java interfaces.
Derek Sollenberger [Tue, 24 Nov 2009 19:50:55 +0000 (14:50 -0500)]
Refactoring sample plugin to use updated java interfaces.
Jack Palevich [Fri, 27 Nov 2009 11:54:46 +0000 (19:54 +0800)]
Add OpenGL ES 2.0 sample.
This sample renders a textured triangle using OpenGL ES 2.0.
If OpenGL ES 2.0 is not available, the sample falls back to
using OpenGL ES 1.0.
Dianne Hackborn [Thu, 26 Nov 2009 00:40:52 +0000 (16:40 -0800)]
Add API demo for services that run in the foreground.
Change-Id: I7acb0817e5d738294bef02ca2df3c2ab18b45f60
Andrew Stadler [Wed, 25 Nov 2009 00:17:22 +0000 (16:17 -0800)]
am
140e10cf: am
2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Merge commit '
140e10cfae201688bc10f67ad12c989b67f60b3c'
* commit '
140e10cfae201688bc10f67ad12c989b67f60b3c':
Fix eclipse default .classpath
Andrew Stadler [Wed, 25 Nov 2009 00:13:55 +0000 (16:13 -0800)]
am
2171d57c: Merge change I6f2fcdd7 into eclair-mr2
Merge commit '
2171d57cfcc25e7db63b4ae0a852504bdd3c507e' into eclair-mr2-plus-aosp
* commit '
2171d57cfcc25e7db63b4ae0a852504bdd3c507e':
Fix eclipse default .classpath
Android (Google) Code Review [Wed, 25 Nov 2009 00:08:54 +0000 (16:08 -0800)]
Merge change I6f2fcdd7 into eclair-mr2
* changes:
Fix eclipse default .classpath
Andrew Stadler [Tue, 24 Nov 2009 21:50:26 +0000 (13:50 -0800)]
Fix eclipse default .classpath
* Add frameworks/base/common/java
* Remove external/googleclient/googleclient-lib.jar
David 'Digit' Turner [Tue, 24 Nov 2009 01:12:25 +0000 (17:12 -0800)]
am
014d368c: am
4b4129d3: am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
014d368c389cfeb29aeb59448696cf08a6d8c47a'
* commit '
014d368c389cfeb29aeb59448696cf08a6d8c47a':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:12:21 +0000 (17:12 -0800)]
am
f7c5f462: am
78cab803: am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
f7c5f462dd904a00d7d0bfb7e4cb300798592cdf'
* commit '
f7c5f462dd904a00d7d0bfb7e4cb300798592cdf':
Correct the raw offsets in the time zone index for a few zones.
David 'Digit' Turner [Tue, 24 Nov 2009 01:08:16 +0000 (17:08 -0800)]
am
4b4129d3: am
cc09e088: Merge change Icb96cddc into eclair
Merge commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b' into eclair-mr2-plus-aosp
* commit '
4b4129d30c75ab58f2ff9cb0696e894fde2b144b':
Cleanup installed binaries before the NDK build begins.
Eric Fischer [Tue, 24 Nov 2009 01:08:12 +0000 (17:08 -0800)]
am
78cab803: am
0d6684c8: Merge change I44da0c8f into eclair
Merge commit '
78cab8038a79f1e42e42b17b0ff180e676653e31' into eclair-mr2-plus-aosp
* commit '
78cab8038a79f1e42e42b17b0ff180e676653e31':
Correct the raw offsets in the time zone index for a few zones.