OSDN Git Service
The Android Automerger [Tue, 20 Jul 2010 16:45:18 +0000 (09:45 -0700)]
GRG20
Change-Id: Ib98b9aa208b3e6a45c776b6d409413be3d33bcbb
The Android Automerger [Mon, 19 Jul 2010 15:34:08 +0000 (08:34 -0700)]
GRG19
Change-Id: I023eeabe08b60421c4fc544a1feedd2bc4f0c3f7
The Android Automerger [Fri, 16 Jul 2010 15:18:59 +0000 (08:18 -0700)]
GRG16
Change-Id: I39fe307b0c3938981b3507fa10d64dd6825517cb
The Android Automerger [Fri, 16 Jul 2010 15:18:27 +0000 (08:18 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Joe Onorato [Fri, 16 Jul 2010 00:02:25 +0000 (17:02 -0700)]
Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
Scott Main [Thu, 15 Jul 2010 23:43:38 +0000 (16:43 -0700)]
am
9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '
9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread
* commit '
9269a711753f2523acd3fe5ae661559f754a1bd0':
docs: ensure code-ified links in qv are the proper color
Scott Main [Fri, 25 Jun 2010 23:09:24 +0000 (16:09 -0700)]
docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
Joe Onorato [Thu, 15 Jul 2010 18:07:42 +0000 (11:07 -0700)]
Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:07:35 +0000 (11:07 -0700)]
Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:07:30 +0000 (11:07 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
The Android Automerger [Thu, 15 Jul 2010 15:44:36 +0000 (08:44 -0700)]
GRG15
Change-Id: Ic51e1429819ee10647188d1444fb73960ee8e38d
The Android Automerger [Thu, 15 Jul 2010 15:44:06 +0000 (08:44 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Joe Onorato [Thu, 15 Jul 2010 02:49:05 +0000 (19:49 -0700)]
Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk. That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.
With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.
Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
Mathias Agopian [Wed, 14 Jul 2010 23:31:43 +0000 (16:31 -0700)]
Merge "add an entry for the new libgui" into gingerbread
The Android Automerger [Wed, 14 Jul 2010 23:29:50 +0000 (16:29 -0700)]
GRG14B
Change-Id: Ibfb3a313142fb7f2b9aecea7e9bceda0f21aeb46
The Android Automerger [Wed, 14 Jul 2010 23:29:36 +0000 (16:29 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:29:08 +0000 (11:29 -0700)]
am
a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit '
a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread
* commit '
a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
Build Accessibility Tests and APK
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:06:23 +0000 (11:06 -0700)]
Merge "merge from open-source froyo" into froyo
Joe Onorato [Wed, 14 Jul 2010 17:22:54 +0000 (10:22 -0700)]
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.
Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
The Android Automerger [Wed, 14 Jul 2010 15:17:49 +0000 (08:17 -0700)]
GRG14
Change-Id: I29e738e10263ab0dfbaaa633658214d7b67ee98c
The Android Automerger [Wed, 14 Jul 2010 15:17:37 +0000 (08:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Mathias Agopian [Wed, 14 Jul 2010 05:26:21 +0000 (22:26 -0700)]
add an entry for the new libgui
libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).
Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
Joe Onorato [Wed, 14 Jul 2010 02:05:37 +0000 (19:05 -0700)]
The ICU data is no longer compiled directly into the shared library.
Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
Ying Wang [Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)]
resolved conflicts for merge of
a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
Ying Wang [Wed, 14 Jul 2010 01:50:05 +0000 (18:50 -0700)]
Merge "Add phony target dist_libraries" into froyo
Ying Wang [Wed, 14 Jul 2010 00:46:29 +0000 (17:46 -0700)]
am
b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '
b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread
* commit '
b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
Ying Wang [Wed, 14 Jul 2010 00:41:14 +0000 (17:41 -0700)]
Keep the crt start/end var name of sh consistent with other archs
So that the PRIVATE_ vars get values correctly.
Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
Ying Wang [Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)]
resolved conflicts for merge of
1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
Ying Wang [Tue, 13 Jul 2010 21:55:47 +0000 (14:55 -0700)]
Support to build native libraries with prebuilt NDK
Bug: http://b/issue?id=
2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
The Android Open Source Project [Tue, 13 Jul 2010 22:24:07 +0000 (15:24 -0700)]
merge from open-source froyo
Change-Id: I2759c464efef13754154310d10816a5781243311
The Android Automerger [Tue, 13 Jul 2010 15:17:36 +0000 (08:17 -0700)]
GRG13
Change-Id: Ieee9e0567310b0f7fce3ecb569c0f2558927fa0b
The Android Automerger [Mon, 12 Jul 2010 15:17:34 +0000 (08:17 -0700)]
GRG12
Change-Id: Iaf4d1bc4106c1601189448d3e24c41316ea226fe
The Android Automerger [Mon, 12 Jul 2010 15:17:19 +0000 (08:17 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Fri, 9 Jul 2010 20:30:14 +0000 (13:30 -0700)]
Merge "Enforce 64-bit build environment" into gingerbread
The Android Automerger [Fri, 9 Jul 2010 15:16:47 +0000 (08:16 -0700)]
GRG09
Change-Id: I5e70289cade506e739a4ef8ab91346019d45f234
The Android Automerger [Thu, 8 Jul 2010 23:20:24 +0000 (16:20 -0700)]
GRG08B
Change-Id: Ib033283a7cca90160750ec8a6b1f20ba48e22cdb
The Android Automerger [Thu, 8 Jul 2010 23:20:12 +0000 (16:20 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Brian Muramatsu [Thu, 8 Jul 2010 20:05:09 +0000 (13:05 -0700)]
Build Accessibility Tests and APK
Bug
2814482
Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.
Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
Scott Main [Thu, 8 Jul 2010 18:42:13 +0000 (11:42 -0700)]
am
b66a5c05: docs: modify redirect link text
Merge commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f' into gingerbread
* commit '
b66a5c0574e14b838d9dc2497540ffc6cb73dc4f':
docs: modify redirect link text
Scott Main [Thu, 8 Jul 2010 18:29:28 +0000 (11:29 -0700)]
docs: modify redirect link text
Change-Id: Ieb26c4278958624b9c7aa8795cd7a8cab87fafec
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment from now on.
Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
The Android Automerger [Thu, 8 Jul 2010 15:17:05 +0000 (08:17 -0700)]
GRG08
Change-Id: Ieff66aa54f46aaed7094029d04ae4e93e6602a74
The Android Automerger [Thu, 8 Jul 2010 15:16:51 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Steve Howard [Wed, 7 Jul 2010 21:07:24 +0000 (14:07 -0700)]
Fix broken interaction of JarJar and Emma.
JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.
Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.
Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
Ying Wang [Wed, 7 Jul 2010 23:57:28 +0000 (16:57 -0700)]
Add phony target dist_libraries
that is only used to put your library into the dist dir when doing a full build.
Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
David Turner [Wed, 7 Jul 2010 21:14:19 +0000 (14:14 -0700)]
Merge "Clean up warnings in soslim" into gingerbread
The Android Automerger [Wed, 7 Jul 2010 15:21:14 +0000 (08:21 -0700)]
GRG07
Change-Id: I139ab17d7e3a812f57c6cbc2bfd1a03673d6170e
The Android Automerger [Tue, 6 Jul 2010 15:10:34 +0000 (08:10 -0700)]
GRG06
Change-Id: I3af337f53801388f7eef30c3516c61de96a92617
The Android Automerger [Tue, 6 Jul 2010 15:08:29 +0000 (08:08 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Automerger [Fri, 2 Jul 2010 15:38:05 +0000 (08:38 -0700)]
GRG02
Change-Id: I6017bbc4fc47a649f7b58bc45dcebe2e82a31f6d
android-build SharedAccount [Fri, 2 Jul 2010 15:34:56 +0000 (08:34 -0700)]
resolve conflicts in build_id.mk
Change-Id: I06a86ec9e2c22b8f948d3dd8041081373d222131
Steve Howard [Mon, 3 May 2010 22:01:38 +0000 (15:01 -0700)]
Manual merge of change 50994 from master (DO NOT MERGE)
Merging from master because I'm bringing my maps API work into
gingerbread.
Fix and enable JarJar in Java builds.
java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.
Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
Ed Heyl [Thu, 1 Jul 2010 17:23:20 +0000 (10:23 -0700)]
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/
2590492 and requested again
Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
Ying Wang [Wed, 30 Jun 2010 23:34:52 +0000 (16:34 -0700)]
am
783f449b: Don\'t copy apns-conf.xml for apps-only build
Merge commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread
* commit '
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
Don't copy apns-conf.xml for apps-only build
Ying Wang [Wed, 30 Jun 2010 22:21:27 +0000 (15:21 -0700)]
Don't copy apns-conf.xml for apps-only build
http://b/issue?id=
2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.
Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
Jean-Baptiste Queru [Wed, 30 Jun 2010 15:58:32 +0000 (08:58 -0700)]
Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread
The Android Automerger [Wed, 30 Jun 2010 15:22:10 +0000 (08:22 -0700)]
GRF91
Change-Id: Ib5661481431a8353adfa34ec5ee78223cd1cc576
The Android Automerger [Wed, 30 Jun 2010 15:21:39 +0000 (08:21 -0700)]
Merge branch 'gingerbread' into gingerbread-release
The Android Open Source Project [Tue, 29 Jun 2010 21:34:16 +0000 (14:34 -0700)]
set up fast-forward from froyo-release to gingerbread
Change-Id: I91ef2a183f34b54405580498a3cab39ec6dc7f24
Ying Wang [Tue, 29 Jun 2010 16:28:56 +0000 (09:28 -0700)]
am
0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
Merge commit '
0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread
* commit '
0af605f3b6e759f480a5124dc6b338ec58e1d40c':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Ying Wang [Tue, 29 Jun 2010 16:18:00 +0000 (09:18 -0700)]
Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
The Android Automerger [Tue, 29 Jun 2010 15:17:15 +0000 (08:17 -0700)]
GRF90
Change-Id: I1a3d96f86e688e1f280bdcd6bb9059df0526b30a
The Android Automerger [Mon, 28 Jun 2010 15:18:58 +0000 (08:18 -0700)]
GRF89
Change-Id: I38695a2b2072dcbe5cb479bc0a06de40de04c415
The Android Automerger [Mon, 28 Jun 2010 15:16:42 +0000 (08:16 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Kenny Root [Sun, 27 Jun 2010 05:39:38 +0000 (22:39 -0700)]
Clean up warnings in soslim
Change-Id: I497745fe9701876272fdbe7a946622a40efffdd5
David 'Digit' Turner [Fri, 25 Jun 2010 17:42:42 +0000 (10:42 -0700)]
Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
The Android Automerger [Fri, 25 Jun 2010 15:16:08 +0000 (08:16 -0700)]
GRF86
Change-Id: Icbc8dace89da08920a9d6d585899e01663858c7f
The Android Automerger [Fri, 25 Jun 2010 15:15:53 +0000 (08:15 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Scott Main [Fri, 25 Jun 2010 01:12:45 +0000 (18:12 -0700)]
am
81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '
81b68ad95d6a8ecb8a44ad453d336dff3a059488' into gingerbread
* commit '
81b68ad95d6a8ecb8a44ad453d336dff3a059488':
docs: show the download message on the SDK homepage because we no longer
Scott Main [Fri, 25 Jun 2010 01:10:32 +0000 (18:10 -0700)]
Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Ying Wang [Fri, 25 Jun 2010 00:59:32 +0000 (17:59 -0700)]
am
c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread
* commit '
c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
Scott Main [Thu, 24 Jun 2010 23:36:54 +0000 (16:36 -0700)]
docs: show the download message on the SDK homepage because we no longer
need to walk through the TOS
Change-Id: I46f7e7284792b2bea77cf2a88b195e8117b4e4d2
android-build SharedAccount [Thu, 24 Jun 2010 23:06:16 +0000 (16:06 -0700)]
frf85B
Change-Id: I012a38642e8f0685d9811ec1a4dcb6e3d59d19bd
Ying Wang [Thu, 24 Jun 2010 22:08:33 +0000 (15:08 -0700)]
default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.
Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
Andy McFadden [Thu, 24 Jun 2010 19:52:51 +0000 (12:52 -0700)]
Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.
With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.
Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
android-build SharedAccount [Thu, 24 Jun 2010 19:28:31 +0000 (12:28 -0700)]
frf85
Change-Id: Ib1a8aa2cd4e652a46f70c54540afc2ea87724779
James Dong [Thu, 24 Jun 2010 18:55:40 +0000 (11:55 -0700)]
Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
Ying Wang [Thu, 24 Jun 2010 18:10:07 +0000 (11:10 -0700)]
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.
Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
James Dong [Thu, 24 Jun 2010 16:52:27 +0000 (09:52 -0700)]
Use stagefright (instead of OpenCore) authoring engine by default
-rebased
Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
Andreas Huber [Thu, 24 Jun 2010 16:05:19 +0000 (09:05 -0700)]
Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
The Android Automerger [Thu, 24 Jun 2010 15:15:40 +0000 (08:15 -0700)]
GRF85
Change-Id: I3301c5fe3e45f63ffdd16a4dbaedea040ab5a9c2
The Android Automerger [Thu, 24 Jun 2010 15:15:08 +0000 (08:15 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Thu, 24 Jun 2010 03:59:22 +0000 (20:59 -0700)]
Fix javadoc for Java 6.
If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException
Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
Andreas Huber [Wed, 23 Jun 2010 23:39:45 +0000 (16:39 -0700)]
Remove now unnecessary property overrides to opt into stagefright.
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug:
2370115
android-build SharedAccount [Wed, 23 Jun 2010 22:44:01 +0000 (15:44 -0700)]
frf84B
Change-Id: I44d0d9d2e9bec68089b1e2d4dee5bd74a847ead1
android-build SharedAccount [Wed, 23 Jun 2010 22:37:41 +0000 (15:37 -0700)]
frf84
Change-Id: Icb9eb9a74294965302cb7bc5ebddb4939953487d
Joe Onorato [Wed, 23 Jun 2010 21:03:13 +0000 (14:03 -0700)]
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh
Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
Ying Wang [Wed, 23 Jun 2010 20:34:22 +0000 (13:34 -0700)]
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
Change-Id: Ibbcd626e6856d9340d9d3e2f916127feed0b6f5c
The Android Automerger [Wed, 23 Jun 2010 15:46:24 +0000 (08:46 -0700)]
GRF84
Change-Id: I6fb4f4c296cd51ac6a06cf6830a274ee491cbb40
The Android Automerger [Wed, 23 Jun 2010 15:46:05 +0000 (08:46 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Tue, 22 Jun 2010 22:49:50 +0000 (15:49 -0700)]
frf83
Change-Id: I25c7ad6d743d7d9a2e13f9eb9b5cede50b4ad249
Jeff Hamilton [Mon, 21 Jun 2010 23:26:38 +0000 (18:26 -0500)]
Switch the required host Java environment to 1.6.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.
Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
The Android Automerger [Tue, 22 Jun 2010 15:14:42 +0000 (08:14 -0700)]
GRF83
Change-Id: I76d8f806015cec704dc53d7362e0decbc783aafc
The Android Automerger [Tue, 22 Jun 2010 15:14:14 +0000 (08:14 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Dianne Hackborn [Sat, 19 Jun 2010 01:14:06 +0000 (18:14 -0700)]
Add new "libandroid" to prelink map.
Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7
Doug Zongker [Mon, 21 Jun 2010 22:40:21 +0000 (15:40 -0700)]
am
3b85269c: include build timestamp in OTA metadata
Merge commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9' into gingerbread
* commit '
3b85269cfe10ec15e9b544dd6964b8c9f5f761f9':
include build timestamp in OTA metadata
Doug Zongker [Mon, 21 Jun 2010 22:30:45 +0000 (15:30 -0700)]
include build timestamp in OTA metadata
Change-Id: I44292c6346db3356dfafbd044027e37a9b467cfe
android-build SharedAccount [Mon, 21 Jun 2010 22:27:11 +0000 (15:27 -0700)]
frf82
Change-Id: Ic8aa76257e743e9923eb03591f64202a624a80ec
Guang Zhu [Mon, 21 Jun 2010 19:34:51 +0000 (12:34 -0700)]
restore emma changes overwrittern by I9174f843
Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
Ying Wang [Mon, 21 Jun 2010 15:47:44 +0000 (08:47 -0700)]
am
06898660: A nothing-to-do build should do nothing.
Merge commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread
* commit '
068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.