OSDN Git Service
Mike Ritter [Fri, 1 May 2009 01:11:16 +0000 (18:11 -0700)]
am
7ce0733: am
925f5d2: AI 148090: Whichdoc = online/offline
Merge commit '
7ce0733ba9428c6616df499f99e17e2ed27cd93f'
* commit '
7ce0733ba9428c6616df499f99e17e2ed27cd93f':
AI 148090: Whichdoc = online/offline
Android (Google) Code Review [Fri, 1 May 2009 01:11:16 +0000 (18:11 -0700)]
am
5941176: Merge change 822 into donut
Merge commit '
5941176ccd7f05ed1786f0b45ecc0905b0effc49'
* commit '
5941176ccd7f05ed1786f0b45ecc0905b0effc49':
Move some simulator fixes from master to donut.
Xavier Ducrohet [Fri, 1 May 2009 00:35:21 +0000 (17:35 -0700)]
merged development with conflicts....
Mike Ritter [Fri, 1 May 2009 00:09:29 +0000 (17:09 -0700)]
am
925f5d2: AI 148090: Whichdoc = online/offline
Merge commit '
925f5d2ee93268cec699210b8f61858211da7289' into donut
* commit '
925f5d2ee93268cec699210b8f61858211da7289':
AI 148090: Whichdoc = online/offline
Mike Ritter [Fri, 1 May 2009 00:07:19 +0000 (17:07 -0700)]
AI 148090: Whichdoc = online/offline
Whichmodule = pdk for clearsilver
Automated import of CL 148090
Android (Google) Code Review [Thu, 30 Apr 2009 21:37:23 +0000 (14:37 -0700)]
Merge change 822 into donut
* changes:
Move some simulator fixes from master to donut. In git master they were part of change
700ccfcc01d3081ff74ef5006e8f0dec5ac52a96, which was an auto import from //branches/master/...@140412 The original change was 134529 in perforce.
Xavier Ducrohet [Thu, 30 Apr 2009 00:34:38 +0000 (17:34 -0700)]
Display the AVD manager wizard during launches where no compatible AVDs exist.
Marco Nelissen [Thu, 30 Apr 2009 21:11:03 +0000 (14:11 -0700)]
Move some simulator fixes from master to donut.
In git master they were part of change
700ccfcc01d3081ff74ef5006e8f0dec5ac52a96,
which was an auto import from //branches/master/...@140412
The original change was 134529 in perforce.
Android (Google) Code Review [Thu, 30 Apr 2009 19:33:07 +0000 (12:33 -0700)]
am
9e2993e: Merge change 770 into donut
Merge commit '
9e2993ed2e07c21262d83294388e0ff09a005866'
* commit '
9e2993ed2e07c21262d83294388e0ff09a005866':
ADT
1603194: Android Package browser for Instrumentation nodes.
Android (Google) Code Review [Thu, 30 Apr 2009 18:59:01 +0000 (11:59 -0700)]
Merge change 770 into donut
* changes:
ADT
1603194: Android Package browser for Instrumentation nodes.
Android (Google) Code Review [Thu, 30 Apr 2009 17:59:06 +0000 (10:59 -0700)]
am
ae23694: Merge change 776 into donut
Merge commit '
ae23694d167404857034b269b6a0cce4da790d64'
* commit '
ae23694d167404857034b269b6a0cce4da790d64':
Make sure we request the Client allocation status even if we fail to open a debugger port for it.
Android (Google) Code Review [Thu, 30 Apr 2009 16:41:46 +0000 (09:41 -0700)]
Merge change 776 into donut
* changes:
Make sure we request the Client allocation status even if we fail to open a debugger port for it.
Mike Ritter [Thu, 30 Apr 2009 07:01:25 +0000 (00:01 -0700)]
am
fba8d83: am
aa2d952: AI 147991: make sources appear in online-pdk/gui
Merge commit '
fba8d837f5d926dc3f469a99edb22f55d69dff76'
* commit '
fba8d837f5d926dc3f469a99edb22f55d69dff76':
AI 147991: make sources appear in online-pdk/guide
Mike Ritter [Thu, 30 Apr 2009 06:30:44 +0000 (23:30 -0700)]
am
aa2d952: AI 147991: make sources appear in online-pdk/guide
Merge commit '
aa2d95234e8350eebf789da2b976f843318dead8' into donut
* commit '
aa2d95234e8350eebf789da2b976f843318dead8':
AI 147991: make sources appear in online-pdk/guide
Xavier Ducrohet [Thu, 30 Apr 2009 04:20:31 +0000 (21:20 -0700)]
am
70fc6e9: Make sure that any exception during the final packaging prop
Merge commit '
70fc6e96af1213c192160a16803feb220e10c561'
* commit '
70fc6e96af1213c192160a16803feb220e10c561':
Make sure that any exception during the final packaging properly put an error marker on the project (since build failed.
Xavier Ducrohet [Thu, 30 Apr 2009 01:18:36 +0000 (18:18 -0700)]
Make sure we request the Client allocation status even if we fail to open a debugger port for it.
Raphael [Thu, 30 Apr 2009 00:32:52 +0000 (17:32 -0700)]
ADT
1603194: Android Package browser for Instrumentation nodes.
Xavier Ducrohet [Wed, 29 Apr 2009 21:38:30 +0000 (14:38 -0700)]
Make sure that any exception during the final packaging properly put an error marker on the project (since build failed.
Android (Google) Code Review [Wed, 29 Apr 2009 20:10:16 +0000 (13:10 -0700)]
am
8ffde4b: Merge change 715 into donut
Merge commit '
8ffde4bf375063f622a5227c349506cb6721f660'
* commit '
8ffde4bf375063f622a5227c349506cb6721f660':
ADT #
1820114: Provide a quick UI to edit AVD.
Android (Google) Code Review [Wed, 29 Apr 2009 19:10:55 +0000 (12:10 -0700)]
Merge change 715 into donut
* changes:
ADT #
1820114: Provide a quick UI to edit AVD.
Scott Main [Wed, 29 Apr 2009 19:06:42 +0000 (12:06 -0700)]
am
82ce558: am
705a3ee: AI 147793: cleanup broken links and delete all i
Merge commit '
82ce5582419cb1a4f1108c2946bac138c3446b21'
* commit '
82ce5582419cb1a4f1108c2946bac138c3446b21':
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
am
3161d1f: Merge change 663 into donut
Merge commit '
3161d1fa496fd4d11e7b10191f686c2a617b2335'
* commit '
3161d1fa496fd4d11e7b10191f686c2a617b2335':
Fix ADT#
1807821: -f option ignored when avd dir already existed.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
am
5ea0a94: Merge change 657 into donut
Merge commit '
5ea0a9436cda662264cc0dcf92d3559d532383bb'
* commit '
5ea0a9436cda662264cc0dcf92d3559d532383bb':
Fix a memory deallocation error that was crashing q2dm.
Raphael [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
am
68fee20: Fix cygwin git script, we need some of the external projects
Merge commit '
68fee208248b8a7cc05033156c8acdb5c74b9fa7'
* commit '
68fee208248b8a7cc05033156c8acdb5c74b9fa7':
Fix cygwin git script, we need some of the external projects.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
am
5949992: Merge change 627 into donut
Merge commit '
594999277ec269bc706647b23ecc11e16f12a971'
* commit '
594999277ec269bc706647b23ecc11e16f12a971':
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
Xavier Ducrohet [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
Xavier Ducrohet [Wed, 29 Apr 2009 19:06:41 +0000 (12:06 -0700)]
am
b1be9fb: Make traceview compile with the new API from SdkStats.
Merge commit '
b1be9fb5098a6ccc2117df5a82e96aba6778edf1'
* commit '
b1be9fb5098a6ccc2117df5a82e96aba6778edf1':
Make traceview compile with the new API from SdkStats.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:40 +0000 (12:06 -0700)]
am
dc7622d: Merge change 609 into donut
Merge commit '
dc7622dca5bd355d57dd07c332d40b2a16b79bdc'
* commit '
dc7622dca5bd355d57dd07c332d40b2a16b79bdc':
Fix the opt-in window for usage stat so that it works when running from ADT.
Raphael [Wed, 29 Apr 2009 19:06:40 +0000 (12:06 -0700)]
am
5ea4287: Documents various git issues for Windows.
Merge commit '
5ea42870afb61660a530341582b750147e5ccaf9'
* commit '
5ea42870afb61660a530341582b750147e5ccaf9':
Documents various git issues for Windows.
Raphael [Wed, 29 Apr 2009 19:06:40 +0000 (12:06 -0700)]
am
aa8c266: Split development/.gitignore into separate gitignore files p
Merge commit '
aa8c266ed05c08af71bfdaa48de44bec3d581102'
* commit '
aa8c266ed05c08af71bfdaa48de44bec3d581102':
Split development/.gitignore into separate gitignore files per project.
Xavier Ducrohet [Wed, 29 Apr 2009 19:06:40 +0000 (12:06 -0700)]
am
07a70dd: Add Eclipse projects bin folders to the gitignore list.
Merge commit '
07a70dd030c8b91c3df095feccb12540ee7b1dfc'
* commit '
07a70dd030c8b91c3df095feccb12540ee7b1dfc':
Add Eclipse projects bin folders to the gitignore list.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
782884a: Merge change 556 into donut
Merge commit '
782884aef34a060c280f7be640e8c2e715750ce8'
* commit '
782884aef34a060c280f7be640e8c2e715750ce8':
Fixed a bug in XML parser handler where some words were being split in two. Fixes #
1812655.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
e007ff4: Merge change 504 into donut
Merge commit '
e007ff4cfa446aebe2c3d5c2e04f76b4258c5b5f'
* commit '
e007ff4cfa446aebe2c3d5c2e04f76b4258c5b5f':
Add network statistics collection to monkey runs.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
999c23d: Merge change 536 into donut
Merge commit '
999c23d2dd647dc8499e7ed9d1d8355a78122452'
* commit '
999c23d2dd647dc8499e7ed9d1d8355a78122452':
ADT #
1810565: Fix symlinks for ADT/DDMS show up in git
Jack Palevich [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
c7ad6e2: Add a sample showing how to use the new static OpenGL ES bin
Merge commit '
c7ad6e203d165a0ca1d4c1e4ef59b6ef1858fe91'
* commit '
c7ad6e203d165a0ca1d4c1e4ef59b6ef1858fe91':
Add a sample showing how to use the new static OpenGL ES bindings.
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
cdf3673: Merge change 506 into donut
Merge commit '
cdf36733a3f7b92c2f3ba36e07d80c12b2af71e5'
* commit '
cdf36733a3f7b92c2f3ba36e07d80c12b2af71e5':
yuv420sp2rgb: a tool to convert from YUV 4:2:0 semiplanar to various RGB formats
Android (Google) Code Review [Wed, 29 Apr 2009 19:06:39 +0000 (12:06 -0700)]
am
7b10ec3: Merge change 434 into donut
Merge commit '
7b10ec3d1f271e25793f71e9af1b36ec69a21f3c'
* commit '
7b10ec3d1f271e25793f71e9af1b36ec69a21f3c':
Added a method in run_command.py to run a host test.
Dave Bort [Wed, 29 Apr 2009 19:06:38 +0000 (12:06 -0700)]
am
a2e3d43: Add official copyright templates
Merge commit '
a2e3d43bb7c274e1630036fdd5cc32cd94808533'
* commit '
a2e3d43bb7c274e1630036fdd5cc32cd94808533':
Add official copyright templates
Raphael [Wed, 29 Apr 2009 06:41:40 +0000 (23:41 -0700)]
ADT #
1820114: Provide a quick UI to edit AVD.
This is temporary and will be replaced once we get the standalone AVD UI.
Mike Ritter [Wed, 29 Apr 2009 16:19:32 +0000 (09:19 -0700)]
AI 147991: make sources appear in online-pdk/guide
BUG=
1815368
Automated import of CL 147991
Scott Main [Wed, 29 Apr 2009 04:53:14 +0000 (21:53 -0700)]
am
705a3ee: AI 147793: cleanup broken links and delete all innacurate in
Merge commit '
705a3ee3975877460c124d98eda12ae16dadd1a6' into donut
* commit '
705a3ee3975877460c124d98eda12ae16dadd1a6':
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
Android (Google) Code Review [Tue, 28 Apr 2009 20:52:51 +0000 (13:52 -0700)]
Merge change 663 into donut
* changes:
Fix ADT#
1807821: -f option ignored when avd dir already existed.
Android (Google) Code Review [Tue, 28 Apr 2009 20:16:19 +0000 (13:16 -0700)]
Merge change 657 into donut
* changes:
Fix a memory deallocation error that was crashing q2dm.
Jack Veenstra [Tue, 28 Apr 2009 18:33:55 +0000 (11:33 -0700)]
Fix a memory deallocation error that was crashing q2dm.
Also fix a bunch of compile warnings by changing "char *" to "const char *".
Raphael [Tue, 28 Apr 2009 19:54:47 +0000 (12:54 -0700)]
Fix ADT#
1807821: -f option ignored when avd dir already existed.
Also fixed an NPE when parsing some invalid AVDs.
Raphael [Tue, 28 Apr 2009 19:11:03 +0000 (12:11 -0700)]
Fix cygwin git script, we need some of the external projects.
Android (Google) Code Review [Tue, 28 Apr 2009 18:02:14 +0000 (11:02 -0700)]
Merge change 627 into donut
* changes:
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
Xavier Ducrohet [Tue, 28 Apr 2009 02:02:03 +0000 (19:02 -0700)]
Move ADT to 0.9.1
Xavier Ducrohet [Tue, 28 Apr 2009 01:52:49 +0000 (18:52 -0700)]
Fix a bunch of issues related to packaging the content of libs (NPE with files with no extension, not ignoring ignorable folders). Also fixed an issue when parsing Manifest with <uses-sdk />
Xavier Ducrohet [Tue, 28 Apr 2009 00:38:40 +0000 (17:38 -0700)]
Make traceview compile with the new API from SdkStats.
Android (Google) Code Review [Mon, 27 Apr 2009 23:08:01 +0000 (16:08 -0700)]
Merge change 609 into donut
* changes:
Fix the opt-in window for usage stat so that it works when running from ADT.
Xavier Ducrohet [Mon, 27 Apr 2009 21:58:09 +0000 (14:58 -0700)]
Fix the opt-in window for usage stat so that it works when running from ADT.
Raphael [Mon, 27 Apr 2009 22:01:16 +0000 (15:01 -0700)]
Documents various git issues for Windows.
Raphael [Mon, 27 Apr 2009 01:07:04 +0000 (18:07 -0700)]
Split development/.gitignore into separate gitignore files per project.
Added missing gitignore for layoutlib_utils.
Changed mkstubs build path to use prebuilt/asm-3.1 instead of asm-3.1 project.
Scott Main [Sat, 25 Apr 2009 21:04:53 +0000 (14:04 -0700)]
AI 147793: cleanup broken links and delete all innacurate info in apidemo pages
BUG=
1810005
Automated import of CL 147793
Xavier Ducrohet [Fri, 24 Apr 2009 23:35:32 +0000 (16:35 -0700)]
Add Eclipse projects bin folders to the gitignore list.
Android (Google) Code Review [Fri, 24 Apr 2009 23:08:21 +0000 (16:08 -0700)]
Merge change 556 into donut
* changes:
Fixed a bug in XML parser handler where some words were being split in two. Fixes #
1812655.
Amith Yamasani [Fri, 24 Apr 2009 22:14:02 +0000 (15:14 -0700)]
Fixed a bug in XML parser handler where some words were being split in two. Fixes #
1812655.
Properly concatenate characters to create a full word before adding the word to the tree.
Android (Google) Code Review [Fri, 24 Apr 2009 22:11:52 +0000 (15:11 -0700)]
Merge change 504 into donut
* changes:
Add network statistics collection to monkey runs.
Android (Google) Code Review [Fri, 24 Apr 2009 21:37:17 +0000 (14:37 -0700)]
Merge change 536 into donut
* changes:
ADT #
1810565: Fix symlinks for ADT/DDMS show up in git
Jack Palevich [Fri, 24 Apr 2009 20:04:26 +0000 (13:04 -0700)]
Add a sample showing how to use the new static OpenGL ES bindings.
(Actually repurpose the existing Texture Triangle sample.)
Raphael Moll [Fri, 24 Apr 2009 03:06:36 +0000 (20:06 -0700)]
ADT #
1810565: Fix symlinks for ADT/DDMS show up in git
Use a .gitignore to prevent files created by
./development/tools/eclipse/scripts/create_all_symlinks.sh
from appearing in git.
This is for Linux. Not sure if we need to amend that for Mac/Windows.
Android (Google) Code Review [Thu, 23 Apr 2009 22:06:39 +0000 (15:06 -0700)]
Merge change 506 into donut
* changes:
yuv420sp2rgb: a tool to convert from YUV 4:2:0 semiplanar to various RGB formats
Android (Google) Code Review [Thu, 23 Apr 2009 21:49:30 +0000 (14:49 -0700)]
Merge change 434 into donut
* changes:
Added a method in run_command.py to run a host test. The run can also happen under valgrind.
Dave Bort [Thu, 23 Apr 2009 20:46:58 +0000 (13:46 -0700)]
Add official copyright templates
Signed-off-by: Dave Bort <dbort@android.com>
Jim Miller [Thu, 23 Apr 2009 00:04:48 +0000 (17:04 -0700)]
Add network statistics collection to monkey runs.
Iliyan Malchev [Thu, 23 Apr 2009 20:14:13 +0000 (13:14 -0700)]
yuv420sp2rgb: a tool to convert from YUV 4:2:0 semiplanar to various RGB formats
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dan Bornstein [Thu, 23 Apr 2009 16:20:34 +0000 (09:20 -0700)]
Removed a superfluous backup file.
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:12 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:50 +0000 (17:56 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:14 +0000 (17:12 -0700)]
Merge donut into master
Mike Ritter [Wed, 22 Apr 2009 20:45:33 +0000 (13:45 -0700)]
Merge branch 'readonly-p4-donut' into donut
Mike Ritter [Wed, 22 Apr 2009 20:44:21 +0000 (13:44 -0700)]
AI 147382: am: CL 147379 copy pdk templates sub-directories also.
Original author: mritter
Merged from: //branches/cupcake/...
Automated import of CL 147382
Jean-Michel Trivi [Wed, 22 Apr 2009 20:17:57 +0000 (13:17 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jean-Michel Trivi [Wed, 22 Apr 2009 20:16:35 +0000 (13:16 -0700)]
AI 147301: am: CL 147296 Reuse the JetPlayer singleton instance in the initialization of JetBoy instead of destroying it.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 147301
Xavier Ducrohet [Wed, 22 Apr 2009 19:13:17 +0000 (12:13 -0700)]
AI 147402: Fix plugin.xml to match refactoring of the new file wizard.
Automated import of CL 147402
Nicolas Catania [Wed, 22 Apr 2009 18:08:32 +0000 (11:08 -0700)]
Added a method in run_command.py to run a host test.
The run can also happen under valgrind.
runtest.py: Search for host test as well. Run these under valgrind.
Mike Ritter [Wed, 22 Apr 2009 17:01:48 +0000 (10:01 -0700)]
Merge branch 'readonly-p4-master'
Mike Ritter [Wed, 22 Apr 2009 17:00:01 +0000 (10:00 -0700)]
AI 147383: am: CL 147382 am: CL 147379 copy pdk templates sub-directories also.
Original author: mritter
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147383
Mike Ritter [Wed, 22 Apr 2009 16:55:08 +0000 (09:55 -0700)]
AI 147379: copy pdk templates sub-directories also.
BUG=
1801344
Automated import of CL 147379
Jean-Michel Trivi [Wed, 22 Apr 2009 01:57:14 +0000 (18:57 -0700)]
Merge branch 'readonly-p4-master'
Jean-Michel Trivi [Wed, 22 Apr 2009 01:56:24 +0000 (18:56 -0700)]
AI 147304: am: CL 147301 am: CL 147296 Reuse the JetPlayer singleton instance in the initialization of JetBoy instead of destroying it.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147304
Jean-Michel Trivi [Wed, 22 Apr 2009 01:50:58 +0000 (18:50 -0700)]
AI 147296: Reuse the JetPlayer singleton instance in the initialization of JetBoy instead of destroying it.
BUG=
1804737
Automated import of CL 147296
Xavier Ducrohet [Tue, 21 Apr 2009 23:24:06 +0000 (16:24 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Tue, 21 Apr 2009 23:24:03 +0000 (16:24 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Tue, 21 Apr 2009 23:22:51 +0000 (16:22 -0700)]
AI 147271: am: CL 147269 Remove "show compass" option as it requires Google Maps dependency.
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 147271
Xavier Ducrohet [Tue, 21 Apr 2009 23:22:37 +0000 (16:22 -0700)]
AI 147272: am: CL 147271 am: CL 147269 Remove "show compass" option as it requires Google Maps dependency.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147272
Xavier Ducrohet [Tue, 21 Apr 2009 23:20:58 +0000 (16:20 -0700)]
AI 147269: Remove "show compass" option as it requires Google Maps dependency.
BUG=
1804337
Automated import of CL 147269
Raphael Moll [Tue, 21 Apr 2009 22:51:07 +0000 (15:51 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 22:50:54 +0000 (15:50 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 22:49:49 +0000 (15:49 -0700)]
AI 147264: am: CL 147262 ADT #
1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147264
Raphael Moll [Tue, 21 Apr 2009 22:49:27 +0000 (15:49 -0700)]
AI 147265: am: CL 147264 am: CL 147262 ADT #
1761055: Pre-select node types when adding node in manifest & resource based on context
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147265
Raphael Moll [Tue, 21 Apr 2009 22:47:39 +0000 (15:47 -0700)]
AI 147262: ADT #
1761055: Pre-select node types when adding node in manifest & resource based on context
BUG=
1761055
Automated import of CL 147262
Jeff Hamilton [Tue, 21 Apr 2009 22:13:43 +0000 (15:13 -0700)]
Merge branch 'readonly-p4-master'
Jeff Hamilton [Tue, 21 Apr 2009 22:12:09 +0000 (15:12 -0700)]
AI 147251: am: CL 147247 am: CL 147243 Make the API sample check to see if there is anything installed to handle the recognition intent.
Original author: jham
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147251
Jeff Hamilton [Tue, 21 Apr 2009 22:10:49 +0000 (15:10 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jeff Hamilton [Tue, 21 Apr 2009 22:09:35 +0000 (15:09 -0700)]
AI 147247: am: CL 147243 Make the API sample check to see if there is anything installed to handle the recognition intent.
Original author: jham
Merged from: //branches/cupcake/...
Automated import of CL 147247
Jeff Hamilton [Tue, 21 Apr 2009 22:05:59 +0000 (15:05 -0700)]
AI 147243: Make the API sample check to see if there is anything installed to handle the recognition intent.
BUG=
1803523
Automated import of CL 147243
Raphael Moll [Tue, 21 Apr 2009 20:26:55 +0000 (13:26 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:25:35 +0000 (13:25 -0700)]
AI 147194: am: CL 147193 am: CL 147190 Javadoc for MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147194