OSDN Git Service
Android (Google) Code Review [Fri, 11 Sep 2009 16:27:30 +0000 (12:27 -0400)]
Merge change 24574 into donut
* changes:
docs only. revise the maxSdkVersion description
Android (Google) Code Review [Fri, 11 Sep 2009 16:19:28 +0000 (12:19 -0400)]
Merge change 24631 into donut
* changes:
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Android (Google) Code Review [Fri, 11 Sep 2009 16:16:19 +0000 (12:16 -0400)]
Merge change 24419 into donut
* changes:
Move API change details from highlights doc to version notes doc.
Android (Google) Code Review [Fri, 11 Sep 2009 02:46:35 +0000 (22:46 -0400)]
Merge change 24641 into donut
* changes:
docs only. change the japanese homepage Market link to go to the Market dev site instead of the English market promo site
Scott Main [Fri, 11 Sep 2009 02:42:39 +0000 (19:42 -0700)]
docs only.
change the japanese homepage Market link
to go to the Market dev site instead of the English market promo site
Change-Id: I81e8675355edee05540f291fdb2654fa44ae1ffa
Scott Main [Fri, 11 Sep 2009 02:22:48 +0000 (19:22 -0700)]
docs only.
add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...
Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
Dirk Dougherty [Thu, 10 Sep 2009 17:45:41 +0000 (10:45 -0700)]
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Change-Id: I24a0c3cb5c15e3725fecb5c64d8aa6de17c76cbd
Scott Main [Thu, 10 Sep 2009 20:54:48 +0000 (13:54 -0700)]
docs only.
revise the maxSdkVersion description
Change-Id: Id71f685fad5d08abc5c07af35edf49f0aa8b0914
Android (Google) Code Review [Fri, 11 Sep 2009 00:17:52 +0000 (20:17 -0400)]
Merge change 24559 into donut
* changes:
docs only. add documentation to notify developers about variable camera specifications and add some more links
Scott Main [Thu, 10 Sep 2009 19:22:07 +0000 (12:22 -0700)]
docs only.
add documentation to notify developers about variable
camera specifications and add some more links
Change-Id: I46ef9811af17858cbc6547f88e626becb481b043
Dirk Dougherty [Wed, 9 Sep 2009 20:33:45 +0000 (13:33 -0700)]
Move API change details from highlights doc to version notes doc.
Change-Id: I7c9123092742d64d986cdb91803f16987cd6b4da
Android (Google) Code Review [Thu, 10 Sep 2009 18:29:59 +0000 (14:29 -0400)]
Merge change 22323 into donut
* changes:
docs only. add the 1.6 platform highlights
Scott Main [Thu, 10 Sep 2009 00:36:09 +0000 (17:36 -0700)]
docs only.
revise ADC2 announcement
Change-Id: Ia2130b8c334053e8e27a4ab680f3bcf57de9504b
Scott Main [Wed, 9 Sep 2009 18:18:05 +0000 (11:18 -0700)]
docs only.
add the 1.6 platform highlights
Change-Id: I231f17025b3eb436fd73c228d499e27562f1883f
Dirk Dougherty [Fri, 4 Sep 2009 22:36:45 +0000 (15:36 -0700)]
Doc change only: Add sizes/checksums for SDK packages.
Change-Id: I11a38fb4002d72cf69ea545bd395b0f97b8caa66
Android (Google) Code Review [Thu, 3 Sep 2009 03:19:39 +0000 (20:19 -0700)]
Merge change 23126 into donut
* changes:
docs only. add documentation about zipalign and new auto-signing procedures for Ant
Scott Main [Wed, 2 Sep 2009 17:25:09 +0000 (10:25 -0700)]
docs only.
add documentation about zipalign and new auto-signing
procedures for Ant
Change-Id: Ia66f5a7af58f77e52b3a5c26cb9972d317c2c42c
Android (Google) Code Review [Thu, 3 Sep 2009 02:29:45 +0000 (19:29 -0700)]
Merge change 23762 into donut
* changes:
Add updated API diff based on 4.xml.
Dirk Dougherty [Thu, 27 Aug 2009 23:26:43 +0000 (16:26 -0700)]
Add docs for SDK update.
Add redirects for preview files.
Manually integrate a few doc changes from cupcake.
Change-Id:I524d7dbf929371ee501599229894640660f352ce
Dirk Dougherty [Fri, 28 Aug 2009 02:19:33 +0000 (19:19 -0700)]
Add updated API diff based on 4.xml.
Change-Id: Ic34f796c8308e2111e2a3dfaad5e27da2ca8b001
Android (Google) Code Review [Thu, 3 Sep 2009 00:55:32 +0000 (17:55 -0700)]
Merge change 23565 into donut
* changes:
docs only. add new announcement for 1.6 sdk to homepage
Scott Main [Fri, 21 Aug 2009 23:41:49 +0000 (16:41 -0700)]
docs only.
add new announcement for 1.6 sdk to homepage
Change-Id: I54c743a8d440de8003b9d08599d94fb2cbd34e39
Jean-Baptiste Queru [Wed, 2 Sep 2009 20:42:05 +0000 (13:42 -0700)]
Merge snapshot version of donut back into the main tree
Jean-Baptiste Queru [Wed, 2 Sep 2009 20:39:46 +0000 (13:39 -0700)]
donut snapshot
Dianne Hackborn [Wed, 2 Sep 2009 02:21:08 +0000 (19:21 -0700)]
Revert "Fix content provider"
Argh!
This reverts commit
da706900f45dca82d89f090e4e52fa5d1772c495.
Android (Google) Code Review [Wed, 2 Sep 2009 02:15:59 +0000 (19:15 -0700)]
Merge change 23569 into donut
* changes:
Update 4.xml to the most recent APIs.
Dianne Hackborn [Wed, 2 Sep 2009 02:14:55 +0000 (19:14 -0700)]
Update 4.xml to the most recent APIs.
Android (Google) Code Review [Wed, 2 Sep 2009 02:09:24 +0000 (19:09 -0700)]
Merge change 23499 into donut
* changes:
Fix content provider
Android (Google) Code Review [Wed, 2 Sep 2009 02:04:15 +0000 (19:04 -0700)]
Merge change 23503 into donut
* changes:
docs only. expand the uses-feature docs
Scott Main [Tue, 1 Sep 2009 21:10:06 +0000 (14:10 -0700)]
docs only.
expand the uses-feature docs
Change-Id: I47e7d7570fdab6f0f698ecc978c8cecca8c1d28b
Scott Main [Tue, 1 Sep 2009 23:17:36 +0000 (16:17 -0700)]
docs only.
add syntax samples for all attributes and revise
targetSdkVersion information.
Change-Id: I164da5870743be259e64827c36c4c5eed55fa2b0
Dianne Hackborn [Tue, 1 Sep 2009 20:57:11 +0000 (13:57 -0700)]
Fix content provider
Android (Google) Code Review [Tue, 1 Sep 2009 18:16:25 +0000 (11:16 -0700)]
Merge change 23345 into donut
* changes:
Fix an emoji-measuring bug that caused an exception when editing a contact.
Eric Fischer [Mon, 31 Aug 2009 22:14:35 +0000 (15:14 -0700)]
Fix an emoji-measuring bug that caused an exception when editing a contact.
It was measuring the text to try to determine the size that it needed to
scale the emoji character to. Unfortunately it was accidentally trying
to measure the character under the cursor instead of the emoji character
itself, which is wrong, but more seriously doesn't work at all when the
cursor is at the end of the line.
This was already fixed before in change 144474, but that change never got
merged over to donut. So this merges it now.
Bug
2087915
Change-Id: Ib4804d330a029a966207b3b07271f84e6b2652c0
Scott Main [Tue, 1 Sep 2009 01:04:52 +0000 (18:04 -0700)]
docs only.
revise samples link for offline docs to point to the current version
Android (Google) Code Review [Mon, 31 Aug 2009 22:00:36 +0000 (15:00 -0700)]
Merge change 23242 into donut
* changes:
docs only. add uses-feature "name" attribute
Scott Main [Sat, 29 Aug 2009 21:41:57 +0000 (14:41 -0700)]
docs only.
add uses-feature "name" attribute
Jean-Baptiste Queru [Mon, 31 Aug 2009 16:32:01 +0000 (09:32 -0700)]
Merge snapshot version of donut back into the main tree
Jean-Baptiste Queru [Mon, 31 Aug 2009 16:17:57 +0000 (09:17 -0700)]
donut snapshot
Android (Google) Code Review [Sat, 29 Aug 2009 20:38:17 +0000 (13:38 -0700)]
Merge change 23241 into donut
* changes:
add searchable dictionary to html docs and dev guide nav and add screenshots.
Scott Main [Sat, 29 Aug 2009 20:17:53 +0000 (13:17 -0700)]
add searchable dictionary to html docs and dev guide nav
and add screenshots.
Android (Google) Code Review [Fri, 28 Aug 2009 23:14:21 +0000 (16:14 -0700)]
Merge change 23198 into donut
* changes:
Update SearchManager documentation to reflect latest behavior.
Mike LeBeau [Fri, 28 Aug 2009 22:03:02 +0000 (15:03 -0700)]
Update SearchManager documentation to reflect latest behavior.
Android (Google) Code Review [Fri, 28 Aug 2009 20:48:09 +0000 (13:48 -0700)]
Merge change 23173 into donut
* changes:
Remove flaky test LifecycleTest.testDialog from large continuous suite.
Brett Chabot [Fri, 28 Aug 2009 20:42:10 +0000 (13:42 -0700)]
Remove flaky test LifecycleTest.testDialog from large continuous suite.
BUG
1866891
Change-Id: Ifef98426cf3879fc9f17aa5a0891578fefa54ce3
Android (Google) Code Review [Fri, 28 Aug 2009 01:32:27 +0000 (18:32 -0700)]
Merge change 23043 into donut
* changes:
Revert "Remove third party support for Quick Search Box (aka global search)."
Karl Rosaen [Fri, 28 Aug 2009 00:42:48 +0000 (17:42 -0700)]
Revert "Remove third party support for Quick Search Box (aka global search)."
This reverts commit
a647b7f29d65a7792cede74284e714b591337992.
Android (Google) Code Review [Thu, 27 Aug 2009 19:57:09 +0000 (12:57 -0700)]
Merge change 22939 into donut
* changes:
Final Donut API list.
Dianne Hackborn [Thu, 27 Aug 2009 19:11:10 +0000 (12:11 -0700)]
Final Donut API list.
Android (Google) Code Review [Thu, 27 Aug 2009 08:14:00 +0000 (01:14 -0700)]
Merge change 22883 into donut
* changes:
Various tweaks to try to improve low memory behavior.
Dianne Hackborn [Thu, 27 Aug 2009 07:44:33 +0000 (00:44 -0700)]
Various tweaks to try to improve low memory behavior.
- Reduce the amount that we ask processes to GC after a significant
operation occurs, but introducing a minimum time between GCs and
using this in various ways to schedule them.
- Don't spam all of the processes with onLowMemory(). Now deliver
these using the same gc facility, so we do the processes one at a
time, and don't allow the same process to get this call more than
once a minute.
- Increase the time a service must run before we will reset its
restart delay to 30 minutes (from 10).
- Increase the restart delay multiplication factor from 2 to 4.
- Ensure that we don't restart more than one service every 10 seconds
(unless some external event causes a service's process to be started
for some other reason of course).
- Increase the amount of time that a service must run before we
decide to lower it to a background process.
And some other things:
- Catch IllegalArgumentException in ViewRoot like we do for no
resources to avoid the system process crashing.
- Fix a number of places where we were missing breaks between the
activity manager's message dispatch func(!!).
- Fix reason printed for processes in the background.
- Print the list of processing waiting to GC.
Mike Lockwood [Tue, 25 Aug 2009 17:05:18 +0000 (10:05 -0700)]
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Wed, 26 Aug 2009 19:55:54 +0000 (12:55 -0700)]
Merge change 22090 into donut
* changes:
docs only. add new documentation for installing the new winusb driver. also add a link to the HTC support site for ADP flashing and remove references to the G1 and generalize to "consumer devices"
Scott Main [Wed, 26 Aug 2009 18:56:57 +0000 (11:56 -0700)]
docs only.
add new documentation for installing the new winusb driver.
also add a link to the HTC support site for ADP flashing
and remove references to the G1 and generalize to "consumer devices"
Bjorn Bringert [Wed, 26 Aug 2009 12:18:40 +0000 (13:18 +0100)]
Close suggestion cursors that arrive after adapter is closed
Before, after using the Browser, memory-hungry apps could
become very sluggish. This was because the search dialog in the
system process had the BrowserProvider open, which in turn had
EnhancedGoogleSearch open. Since EhancedGoogleSearch runs in acore,
the system would keep both the Browser process and acore to stay
around forever.
The cause (or at least one common cause) for this was that
if the user types quickly, and clicks on a suggestion before
the displayed suggestions have caught up, some suggestion cursors
are not be closed.
This change solves this problem by adding a close() method to
SuggestionsAdapter. SuggestionsAdapter now closes any cursors
that are passed to it after close() is called.
Fixes http://b/issue?id=
2078226
"global search holding reference to browser: system -> browser -> acore = :("
Yu Shan Emily Lau [Tue, 25 Aug 2009 17:21:31 +0000 (10:21 -0700)]
Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
This reverts commit
051d8d6692a4f8d852f6336d1e31a3a907913ac7.
Scott Main [Mon, 24 Aug 2009 21:45:00 +0000 (14:45 -0700)]
Add more code samples to the online docs.
Add build rules to include the development samples in the droiddoc build process.
Add all the sample screenshots to a new samples/images/ directory
Revise the samples homepage to include links to new samples
Android (Google) Code Review [Mon, 24 Aug 2009 17:11:00 +0000 (10:11 -0700)]
Merge change 22379 into donut
* changes:
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
Yu Shan Emily Lau [Sat, 22 Aug 2009 02:06:18 +0000 (19:06 -0700)]
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Android (Google) Code Review [Fri, 21 Aug 2009 21:47:41 +0000 (14:47 -0700)]
Merge change 22322 into donut
* changes:
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Eric Fischer [Fri, 21 Aug 2009 20:31:54 +0000 (13:31 -0700)]
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Without this, the runtime would restart when you tried to add a word
from the search widget.
Bug
2069689
Anonymous Coward [Fri, 21 Aug 2009 00:53:27 +0000 (17:53 -0700)]
Remove third party support for Quick Search Box (aka global search).
- @hides relevant APIs
- removes relevant javadoc
- enforces that only system apps can participate
note: general support is still there, will be easy to reenable when we are ready.
Bob Lee [Fri, 21 Aug 2009 00:36:11 +0000 (17:36 -0700)]
Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
Eric Fischer [Thu, 20 Aug 2009 21:07:18 +0000 (14:07 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Thu, 20 Aug 2009 18:19:08 +0000 (11:19 -0700)]
Merge change 21977 into donut
* changes:
docs only. add reference information for new <path-permission> element
Scott Main [Wed, 19 Aug 2009 21:52:09 +0000 (14:52 -0700)]
docs only.
add reference information for new <path-permission> element
Suchi Amalapurapu [Tue, 18 Aug 2009 23:57:41 +0000 (16:57 -0700)]
invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
Android (Google) Code Review [Tue, 18 Aug 2009 20:39:50 +0000 (13:39 -0700)]
Merge change 21772 into donut
* changes:
Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
Xavier Ducrohet [Tue, 18 Aug 2009 20:35:55 +0000 (13:35 -0700)]
Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
Eric Fischer [Tue, 18 Aug 2009 18:19:17 +0000 (11:19 -0700)]
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Tue, 18 Aug 2009 01:38:53 +0000 (18:38 -0700)]
Merge change 21652 into donut
* changes:
Make ZoomButtonsController public.
Jack Palevich [Tue, 18 Aug 2009 01:29:52 +0000 (18:29 -0700)]
Make ZoomButtonsController public.
Android (Google) Code Review [Tue, 18 Aug 2009 00:58:05 +0000 (17:58 -0700)]
Merge change 21178 into donut
* changes:
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
Suchi Amalapurapu [Mon, 17 Aug 2009 23:57:03 +0000 (16:57 -0700)]
Remove dead locks in system process when installing packages
Bob Lee [Thu, 13 Aug 2009 21:41:54 +0000 (14:41 -0700)]
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
Android (Google) Code Review [Mon, 17 Aug 2009 21:22:24 +0000 (14:22 -0700)]
Merge change 21408 into donut
* changes:
Improved drawing/matrix support in layoutlib
Android (Google) Code Review [Mon, 17 Aug 2009 21:19:42 +0000 (14:19 -0700)]
Merge change 21572 into donut
* changes:
Add constants to adjust Vending input and output buffer sizes.
Xavier Ducrohet [Sat, 15 Aug 2009 03:47:50 +0000 (20:47 -0700)]
Improved drawing/matrix support in layoutlib
- Make the custom Canvas actually replace the original one so that it's used
even by parts of the framework that allocate their own temp Canvas object.
- Better support for Matrix: added support for mapPoint() and mapRect(), and invert()
- Implemented drawBitmap() with a Matrix, and made the paint object not NPE when null.
Android (Google) Code Review [Mon, 17 Aug 2009 20:42:24 +0000 (13:42 -0700)]
Merge change 21549 into donut
* changes:
Import revised translations. DO NOT MERGE
Jasperln [Mon, 17 Aug 2009 20:29:11 +0000 (13:29 -0700)]
Add constants to adjust Vending input and output buffer sizes.
- Needed for Bug:
2058060
Eric Fischer [Mon, 17 Aug 2009 20:13:44 +0000 (13:13 -0700)]
Import revised translations. DO NOT MERGE
Dianne Hackborn [Mon, 17 Aug 2009 19:51:17 +0000 (12:51 -0700)]
Fix issue #
2056585: applications can put phone in inconsistent state wrt airplane mode
Mike LeBeau [Mon, 17 Aug 2009 17:56:02 +0000 (10:56 -0700)]
Correct comments for startSearch in Activity and SearchManager to explain
Donut behavior correctly.
Android (Google) Code Review [Fri, 14 Aug 2009 23:28:12 +0000 (16:28 -0700)]
Merge change 21358 into donut
* changes:
Unhide the broadcast intent that signals completion of the TTS language files. This is required for bug
2022435. Correct the javadoc where two intents were mislabelled as broadcast, but were activity actions.
Jean-Michel Trivi [Fri, 14 Aug 2009 22:44:31 +0000 (15:44 -0700)]
Unhide the broadcast intent that signals completion of the TTS language
files. This is required for bug
2022435.
Correct the javadoc where two intents were mislabelled as broadcast,
but were activity actions.
Suchi Amalapurapu [Fri, 14 Aug 2009 22:13:09 +0000 (15:13 -0700)]
Add maxSdkVersion information in dump badging option
Android (Google) Code Review [Fri, 14 Aug 2009 17:57:25 +0000 (10:57 -0700)]
Merge change 21241 into donut
* changes:
Layoutlib now uses the dimen status_bar_height instead of hard-coded value
Android (Google) Code Review [Fri, 14 Aug 2009 17:24:07 +0000 (10:24 -0700)]
Merge change 21226 into donut
* changes:
Fix bug
2046705 where the output of the speech synthesizer is too low. The language files for the SVOX Pico engine result in the output of the synthesizer to be too soft, and barely audible on a phone speaker. The change implements a low shelf filter on the output of the synthesis and a drastic amplification. This works as intended because the synthesized data contains too much energy in the lower frequencies that is wasted on a phone speaker. Once filtered out, they leave room for amplication to address the volume issue.
Jean-Michel Trivi [Fri, 14 Aug 2009 02:05:45 +0000 (19:05 -0700)]
Fix bug
2046705 where the output of the speech synthesizer is too low.
The language files for the SVOX Pico engine result in the output of
the synthesizer to be too soft, and barely audible on a phone speaker.
The change implements a low shelf filter on the output of the synthesis
and a drastic amplification. This works as intended because the
synthesized data contains too much energy in the lower frequencies that
is wasted on a phone speaker. Once filtered out, they leave room for
amplication to address the volume issue.
Android (Google) Code Review [Fri, 14 Aug 2009 16:04:59 +0000 (09:04 -0700)]
Merge change 21124 into donut
* changes:
Add license-related files
Xavier Ducrohet [Fri, 14 Aug 2009 04:48:03 +0000 (21:48 -0700)]
Layoutlib now uses the dimen status_bar_height instead of hard-coded value
BUG:
2053956
Android (Google) Code Review [Fri, 14 Aug 2009 00:33:03 +0000 (17:33 -0700)]
Merge change 21149 into donut
* changes:
DOCS ONLY. add manifest documentation for uses-feature and supports-screens elements. also update the navigation and manifest home page, update the uses-sdk element to include new maxSdk and targeSdk attributes, and add some sample code to DisplayMetrics to query the device for screen info.
Scott Main [Thu, 13 Aug 2009 19:45:31 +0000 (12:45 -0700)]
DOCS ONLY.
add manifest documentation for uses-feature and supports-screens elements.
also update the navigation and manifest home page,
update the uses-sdk element to include new maxSdk and targeSdk attributes,
and add some sample code to DisplayMetrics to query the device for screen info.
Android (Google) Code Review [Thu, 13 Aug 2009 19:36:22 +0000 (12:36 -0700)]
Merge change 21100 into donut
* changes:
Use dataRoaming in dataConnectionTracker.
Android (Google) Code Review [Thu, 13 Aug 2009 18:31:07 +0000 (11:31 -0700)]
Merge change 21063 into donut
* changes:
Fix handling of reference XML file in layout files
Xavier Ducrohet [Thu, 13 Aug 2009 04:47:11 +0000 (21:47 -0700)]
Fix handling of reference XML file in layout files
This allows layout that references animation to properly load
in the layout editor in ADT
Android (Google) Code Review [Thu, 13 Aug 2009 18:13:46 +0000 (11:13 -0700)]
Merge change 21033 into donut
* changes:
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
Jean-Baptiste Queru [Thu, 13 Aug 2009 17:58:11 +0000 (10:58 -0700)]
Add license-related files
BUG=
1573996
John Wang [Thu, 13 Aug 2009 12:32:17 +0000 (05:32 -0700)]
Use dataRoaming in dataConnectionTracker.
Seperate dataRoaming from gsmRoaming. dataRoaming is based on +CGREG returns in GSM while gsmRoaming is based on +CREG returns. Previously, the status of dataRoaming is always treated the same as gsmRoaming. However there is a situation where +CREG returns 0 and +CGREG returns 5, i.e., gsmRoaming is off and dataRoaming is on. In such situation, the phone should setup data connection if the phone enables data service when roaming (for example, data only card). The phone shouldn't setup data connection if the phone disable data service when roaming (to prevent roaming data charge). So gsmDataConnectionTracker should use dataRoaming instead of gsmRoaming to decide if data service allowed.
modified: GsmDataConnectionTracker.java
modified: GsmServiceStateTracker.java
Android (Google) Code Review [Thu, 13 Aug 2009 04:36:22 +0000 (21:36 -0700)]
Merge change 21055 into donut
* changes:
Lock in final resource identifiers.