OSDN Git Service
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
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.
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
Raphael Moll [Tue, 21 Apr 2009 20:24:01 +0000 (13:24 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:22:51 +0000 (13:22 -0700)]
AI 147193: am: CL 147190 Javadoc for MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147193
Raphael Moll [Tue, 21 Apr 2009 20:20:37 +0000 (13:20 -0700)]
AI 147190: Javadoc for MkStubs.
BUG=
1778786
Automated import of CL 147190
Raphael Moll [Tue, 21 Apr 2009 20:12:00 +0000 (13:12 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:10:40 +0000 (13:10 -0700)]
AI 147181: am: CL 147177 am: CL 147175 ADT #
1801951: "adb.exe" misses the dot in android_rules.xml
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147181
Raphael Moll [Tue, 21 Apr 2009 20:09:20 +0000 (13:09 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:08:08 +0000 (13:08 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Tue, 21 Apr 2009 20:07:50 +0000 (13:07 -0700)]
AI 147177: am: CL 147175 ADT #
1801951: "adb.exe" misses the dot in android_rules.xml
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147177
Raphael Moll [Tue, 21 Apr 2009 20:06:35 +0000 (13:06 -0700)]
AI 147180: am: CL 147176 am: CL 147174 ADT #
1801919: Make default options output a bit more friendly.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147180
Raphael Moll [Tue, 21 Apr 2009 20:06:05 +0000 (13:06 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Tue, 21 Apr 2009 20:04:52 +0000 (13:04 -0700)]
AI 147175: ADT #
1801951: "adb.exe" misses the dot in android_rules.xml
BUG=
1801951
Automated import of CL 147175
Raphael Moll [Tue, 21 Apr 2009 20:04:49 +0000 (13:04 -0700)]
AI 147176: am: CL 147174 ADT #
1801919: Make default options output a bit more friendly.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147176
Raphael Moll [Tue, 21 Apr 2009 20:03:55 +0000 (13:03 -0700)]
AI 147174: ADT #
1801919: Make default options output a bit more friendly.
BUG=
1801919
Automated import of CL 147174
Andy Stadler [Tue, 21 Apr 2009 18:55:42 +0000 (11:55 -0700)]
Merge branch 'readonly-p4-master'
Andy Stadler [Tue, 21 Apr 2009 18:54:13 +0000 (11:54 -0700)]
AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
package manager package name (not the java package name, and
not the test package) of the package holding the Activity
under test.
Added similar notations to the ApiDemos call sites.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147169
Andy Stadler [Tue, 21 Apr 2009 18:53:02 +0000 (11:53 -0700)]
Merge branch 'readonly-p4-donut' into donut
Andy Stadler [Tue, 21 Apr 2009 18:51:42 +0000 (11:51 -0700)]
AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
package manager package name (not the java package name, and
not the test package) of the package holding the Activity
under test.
Added similar notations to the ApiDemos call sites.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Automated import of CL 147167
Andy Stadler [Tue, 21 Apr 2009 18:48:53 +0000 (11:48 -0700)]
AI 147162: Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
package manager package name (not the java package name, and
not the test package) of the package holding the Activity
under test.
Added similar notations to the ApiDemos call sites.
JAVADOC ONLY - should be safe change for cupcake sdk.
BUG=
1783981
Automated import of CL 147162
Raphael Moll [Mon, 20 Apr 2009 23:20:10 +0000 (16:20 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Mon, 20 Apr 2009 23:18:59 +0000 (16:18 -0700)]
AI 147029: am: CL 147027 am: CL 147025 ADT #
1795718: disable --mode in "android create project".
The alias build rules do not work and the flag wasn't even used
by ProjectCreator anyway. Will reintroduce later.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147029
Raphael Moll [Mon, 20 Apr 2009 23:16:34 +0000 (16:16 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Mon, 20 Apr 2009 23:15:15 +0000 (16:15 -0700)]
AI 147027: am: CL 147025 ADT #
1795718: disable --mode in "android create project".
The alias build rules do not work and the flag wasn't even used
by ProjectCreator anyway. Will reintroduce later.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147027
Raphael Moll [Mon, 20 Apr 2009 23:13:19 +0000 (16:13 -0700)]
AI 147025: ADT #
1795718: disable --mode in "android create project".
The alias build rules do not work and the flag wasn't even used
by ProjectCreator anyway. Will reintroduce later.
BUG=
1795718
Automated import of CL 147025
Raphael Moll [Mon, 20 Apr 2009 22:44:16 +0000 (15:44 -0700)]
Merge branch 'readonly-p4-master'
Raphael Moll [Mon, 20 Apr 2009 22:43:27 +0000 (15:43 -0700)]
Merge branch 'readonly-p4-donut' into donut
Raphael Moll [Mon, 20 Apr 2009 22:42:50 +0000 (15:42 -0700)]
AI 147015: am: CL 147013 am: CL 147012 A readme describing the usage and limitations of MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 147015
Raphael Moll [Mon, 20 Apr 2009 22:41:59 +0000 (15:41 -0700)]
AI 147013: am: CL 147012 A readme describing the usage and limitations of MkStubs.
Original author: raphael
Merged from: //branches/cupcake/...
Automated import of CL 147013
Raphael Moll [Mon, 20 Apr 2009 22:40:40 +0000 (15:40 -0700)]
AI 147012: A readme describing the usage and limitations of MkStubs.
BUG=
1778786
Automated import of CL 147012
Android (Google) Code Review [Mon, 20 Apr 2009 22:29:06 +0000 (15:29 -0700)]
Merge change 285
* changes:
Added single quotes around the shell command sent to the device. Without the quotes, the shell split the command and the echo statement gets dropped.
Android (Google) Code Review [Mon, 20 Apr 2009 22:21:12 +0000 (15:21 -0700)]
Merge change 334
* changes:
Remove the hardwired runner from the MMS test.
Xavier Ducrohet [Mon, 20 Apr 2009 21:13:35 +0000 (14:13 -0700)]
Merge branch 'readonly-p4-master'
Xavier Ducrohet [Mon, 20 Apr 2009 21:12:39 +0000 (14:12 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Mon, 20 Apr 2009 21:12:14 +0000 (14:12 -0700)]
AI 146986: am: CL 146983 am: CL 146980 Fix the display of the target hash string when displaying unresolved target errors.
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146986