OSDN Git Service
Dirk Dougherty [Tue, 21 Apr 2009 21:55:49 +0000 (14:55 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 21:54:32 +0000 (14:54 -0700)]
AI 147230: am: CL 147228 Add API diff report to SDK docs (API Level 2 to 3)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147230
Scott Main [Tue, 21 Apr 2009 21:28:13 +0000 (14:28 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Tue, 21 Apr 2009 21:26:59 +0000 (14:26 -0700)]
AI 147224: am: CL 147219 update app-signing doc to include a guide to export a signed APK from ADT
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 147224
Dirk Dougherty [Tue, 21 Apr 2009 21:15:40 +0000 (14:15 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 21:14:23 +0000 (14:14 -0700)]
AI 147214: am: CL 147211 Update emulator doc for new usage with avds.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147214
Android (Google) Code Review [Tue, 21 Apr 2009 20:20:07 +0000 (13:20 -0700)]
Merge change 352 into donut
* changes:
Remove dangling media recorder client reference when setCamera() is used.
Android (Google) Code Review [Tue, 21 Apr 2009 19:44:57 +0000 (12:44 -0700)]
Merge change 368 into donut
* changes:
location: Add some null pointer checks.
Mike Lockwood [Tue, 21 Apr 2009 19:13:35 +0000 (12:13 -0700)]
location: Add some null pointer checks.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Andy Stadler [Tue, 21 Apr 2009 18:56:08 +0000 (11:56 -0700)]
Merge branch 'readonly-p4-donut' into donut
Andy Stadler [Tue, 21 Apr 2009 18:54:45 +0000 (11:54 -0700)]
AI 147168: am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java. Add
a (brief - no time for more) description about how to add search
by voice to apps.
JAVADOC ONLY - should be safe change for cupcake sdk.
Original author: stadler
Merged from: //branches/cupcake/...
Automated import of CL 147168
Andy Stadler [Tue, 21 Apr 2009 18:53:07 +0000 (11:53 -0700)]
Merge branch 'readonly-p4-donut' into donut
Andy Stadler [Tue, 21 Apr 2009 18:51:43 +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
Android (Google) Code Review [Tue, 21 Apr 2009 16:40:38 +0000 (09:40 -0700)]
Merge change 360 into donut
* changes:
location: Location Manager wakelock cleanup, phase 1
Mike Lockwood [Tue, 21 Apr 2009 16:38:18 +0000 (09:38 -0700)]
location: Location Manager wakelock cleanup, phase 1
Move cell and wifi lock from LocationManagerService to NetworkLocationProvider
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Tue, 21 Apr 2009 15:18:50 +0000 (08:18 -0700)]
Merge change 336 into donut
* changes:
Ensure ongoing progress updates after using the scroll ball to adjust position.
Dirk Dougherty [Tue, 21 Apr 2009 08:06:57 +0000 (01:06 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 08:05:41 +0000 (01:05 -0700)]
AI 147083: am: CL 147081 Add document describing AVDs and usage. (doc change only)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147083
Dirk Dougherty [Tue, 21 Apr 2009 08:01:28 +0000 (01:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Tue, 21 Apr 2009 08:00:12 +0000 (01:00 -0700)]
AI 147054: am: CL 147053 Add -hdf primer vars for the platform and release ID associated with the current (most recent) SDK.
Currently, the docs that are specific to each SDK release -- downloading, installing, upgrading, requirements -- are stored in a directory with release-derived name, such as "1.1_r1". This change lets documents use generic links to point into the most recent version specific docs, eg href="{@docRoot}sdk/{sdkCurrent}/installing.html" instead of href="{@docRoot}sdk/1.1_r1/installing.html".
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 147054
James Dong [Tue, 21 Apr 2009 02:35:28 +0000 (19:35 -0700)]
Remove dangling media recorder client reference when setCamera() is used.
Andreas Huber [Mon, 20 Apr 2009 21:22:31 +0000 (14:22 -0700)]
Ensure ongoing progress updates after using the scroll ball to adjust position.
We use a single outstanding message of type SHOW_PROGRESS to refresh the progress
bar's current position as well as textual display of time and duration. This message
could get lost if the scroll ball was used to adjust the current playback position as
we entered state "mDragging" which would cause the subsequent SHOW_PROGRESS message
to be a no-op and would also cause it to not be re-enqueued.
The change refactors the seekbar logic a little and makes sure that while dragging
there isn't a pending SHOW_PROGRESS message in the queue and once dragging is over,
exactly one SHOW_PROGRESS message is reenqueued.
related to bug
1721227
Jean-Michel Trivi [Mon, 20 Apr 2009 23:31:35 +0000 (16:31 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jean-Michel Trivi [Mon, 20 Apr 2009 23:30:18 +0000 (16:30 -0700)]
AI 147035: am: CL 147032 Finalize JetPlayer javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 147035
Jean-Michel Trivi [Mon, 20 Apr 2009 17:47:31 +0000 (10:47 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jean-Michel Trivi [Mon, 20 Apr 2009 17:45:23 +0000 (10:45 -0700)]
AI 146938: am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 146938
Dmitry Shmidt [Mon, 20 Apr 2009 16:50:17 +0000 (09:50 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dmitry Shmidt [Mon, 20 Apr 2009 16:48:54 +0000 (09:48 -0700)]
AI 146934: Make TI Wifi driver choice framework-independent - part 1
BUG=
1786365
Automated import of CL 146934
Evan Millar [Sat, 18 Apr 2009 19:27:51 +0000 (12:27 -0700)]
Merge branch 'readonly-p4-donut' into donut
Evan Millar [Sat, 18 Apr 2009 19:26:32 +0000 (12:26 -0700)]
AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=
1755458
Automated import of CL 146853
Android (Google) Code Review [Fri, 17 Apr 2009 23:24:12 +0000 (16:24 -0700)]
Merge change 287 into donut
* changes:
Get Sketch compiling.
Joe Onorato [Fri, 17 Apr 2009 23:22:32 +0000 (16:22 -0700)]
Get Sketch compiling.
Add an Android.mk.
Android compiles with Java5, which doesn't let you put @Override on
interface methods.
Mike Lockwood [Fri, 17 Apr 2009 22:03:44 +0000 (18:03 -0400)]
More Location Manager cleanup:
Move LocationCollector support out of GpsLocationProvider.
Don't disable GPS when screen is off.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Fri, 17 Apr 2009 21:20:38 +0000 (14:20 -0700)]
Merge change 279 into donut
* changes:
Add sketch gesture demo application.
Joe Onorato [Fri, 17 Apr 2009 21:18:46 +0000 (14:18 -0700)]
Add sketch gesture demo application.
Initial checkin, there's no Android.mk yet.
Android (Google) Code Review [Fri, 17 Apr 2009 21:05:57 +0000 (14:05 -0700)]
Merge change 263 into donut
* changes:
location: Generalize support for location provider usage tracking.
Mike Lockwood [Fri, 17 Apr 2009 12:24:10 +0000 (08:24 -0400)]
location: Generalize support for location provider usage tracking.
This replaces two different mechanisms that were used for GPS and Netork
location provider tracking.
Move BatteryStats logging of GPS usage from LocationManagerService to
GpsLocationProvider.
Clean up tracking of location listeners in LocationManagerService and remove
some HashMaps that are no longer needed.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dave Sparks [Fri, 17 Apr 2009 18:49:44 +0000 (11:49 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dave Sparks [Fri, 17 Apr 2009 18:48:25 +0000 (11:48 -0700)]
AI 146755: am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146755
Jean-Michel Trivi [Fri, 17 Apr 2009 18:46:50 +0000 (11:46 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jean-Michel Trivi [Fri, 17 Apr 2009 18:45:30 +0000 (11:45 -0700)]
AI 146752: am: CL 146751 Finalize AudioTrack javadoc.
Original author: jmtrivi
Merged from: //branches/cupcake/...
Automated import of CL 146752
Urs Grob [Fri, 17 Apr 2009 18:31:36 +0000 (11:31 -0700)]
Merge branch 'readonly-p4-donut' into donut
Urs Grob [Fri, 17 Apr 2009 18:30:14 +0000 (11:30 -0700)]
AI 146743: am: CL 146711 Enhancing the test runner. Now it filters BrokenTests and only executes tests
annotated with SideEffect if the host is running in single test mode.
Also adding some cleanup mechanism and some logcat logging about memory consumption
Original author: ursg
Merged from: //branches/cupcake/...
Automated import of CL 146743
Dave Sparks [Fri, 17 Apr 2009 02:55:31 +0000 (19:55 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dave Sparks [Fri, 17 Apr 2009 02:54:16 +0000 (19:54 -0700)]
AI 146668: am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146668
Android (Google) Code Review [Fri, 17 Apr 2009 00:55:44 +0000 (17:55 -0700)]
Merge change 233 into donut
* changes:
Add an Android-specific static OpenGL ES 1.1 Java API.
Dave Sparks [Fri, 17 Apr 2009 00:51:48 +0000 (17:51 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dave Sparks [Fri, 17 Apr 2009 00:50:27 +0000 (17:50 -0700)]
AI 146655: am: CL 146654 Add java docs for SoundPool
Original author: davidsparks
Merged from: //branches/cupcake/...
Automated import of CL 146655
Jack Palevich [Thu, 16 Apr 2009 02:13:17 +0000 (19:13 -0700)]
Add an Android-specific static OpenGL ES 1.1 Java API.
This change adds four new public classes that expose a static OpenGL ES 1.1 API:
android.opengl.GLES10
android.opengl.GLES10Ext
android.opengl.GLES11
android.opengl.GLES11Ext
Benefits:
+ The static API is slightly faster (1% to 4%) than the existing Interface based JSR239 API.
+ The static API is similar to the C API, which should make it easier to import C-based
example code.
+ The static API provides a clear path for adding new OpenGL ES 1.1 extensions
and OpenGL ES 2.0 APIs, neither of which currently have a JSR standard.
Example:
import static android.opengl.GLES10.*;
...
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
Note that it is possible to mix-and-match calls to both the static and JSR239 APIs.
This works because neither API maintains state. They both call through to the same underlying
C OpenGL ES APIs.
Implementation details:
This change enhances the "glgen" "gen" script to generate both the original JSR239 and
new static OpenGL ES APIs. The contents of the generated JSR239 classes remained the same as before,
so there is no need to check in new versions of the generated JSR239 classes.
As part of this work the gen script was updated to be somewhat more robust, and to
work with git instead of perforce. The script prints out commands to git add the generated files,
but leaves it up to the script runner to actually execute those commands.
Brandon Ballinger [Thu, 16 Apr 2009 21:33:04 +0000 (14:33 -0700)]
Merge branch 'readonly-p4-donut' into donut
Brandon Ballinger [Thu, 16 Apr 2009 21:31:48 +0000 (14:31 -0700)]
AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Automated import of CL 146613
Dirk Dougherty [Thu, 16 Apr 2009 21:29:31 +0000 (14:29 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Thu, 16 Apr 2009 21:28:14 +0000 (14:28 -0700)]
AI 146610: am: CL 146609 updates to the manifest docs for cupcake: Add "since" notations for elements and some attributes.
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146610
Dirk Dougherty [Thu, 16 Apr 2009 20:35:30 +0000 (13:35 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Thu, 16 Apr 2009 20:34:12 +0000 (13:34 -0700)]
AI 146602: am: CL 146601 Update media formats appendix for cupcake
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146602
Xavier Ducrohet [Thu, 16 Apr 2009 19:45:54 +0000 (12:45 -0700)]
Merge branch 'readonly-p4-donut' into donut
Xavier Ducrohet [Thu, 16 Apr 2009 19:44:37 +0000 (12:44 -0700)]
AI 146485: am: CL 146411 Fix BridgeCanvas#drawRoundRect
Original author: xav
Merged from: //branches/cupcake/...
Automated import of CL 146485
Android (Google) Code Review [Thu, 16 Apr 2009 07:05:57 +0000 (00:05 -0700)]
Merge change 187 into donut
* changes:
replaced integer * and % with shift operations, for performance
Tammo Spalink [Wed, 15 Apr 2009 11:15:37 +0000 (19:15 +0800)]
replaced integer * and % with shift operations, for performance
Android (Google) Code Review [Wed, 15 Apr 2009 19:13:07 +0000 (12:13 -0700)]
Merge change 186 into donut
* changes:
eliminate seemingly pointless conversion to and then from hex string
Dirk Dougherty [Wed, 15 Apr 2009 18:35:03 +0000 (11:35 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:33:48 +0000 (11:33 -0700)]
AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change)
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146345
Dirk Dougherty [Wed, 15 Apr 2009 18:32:07 +0000 (11:32 -0700)]
Merge branch 'readonly-p4-donut' into donut
Dirk Dougherty [Wed, 15 Apr 2009 18:30:46 +0000 (11:30 -0700)]
AI 146343: am: CL 146340 Integrate updated SDK Terms and Conditions document
Original author: ddougherty
Merged from: //branches/cupcake/...
Automated import of CL 146343
Android (Google) Code Review [Wed, 15 Apr 2009 15:21:40 +0000 (08:21 -0700)]
Merge change 190 into donut
* changes:
location: Move geocoding support from ILocationProvider to a new interface.
Mike Lockwood [Wed, 15 Apr 2009 15:10:11 +0000 (11:10 -0400)]
location: Move geocoding support from ILocationProvider to a new interface.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Wed, 15 Apr 2009 13:14:11 +0000 (06:14 -0700)]
Merge change 174 into donut
* changes:
Improve glgen
Tammo Spalink [Wed, 15 Apr 2009 10:50:38 +0000 (18:50 +0800)]
eliminate seemingly pointless conversion to and then from hex string
Android (Google) Code Review [Wed, 15 Apr 2009 03:19:42 +0000 (20:19 -0700)]
Merge change 175 into donut
* changes:
telephony: Don't disable an APN type that is not enabled.
Mike Lockwood [Wed, 15 Apr 2009 02:35:07 +0000 (22:35 -0400)]
telephony: Don't disable an APN type that is not enabled.
Fixes a bad interaction between MMS and SUPL that occurs when they are using
the same APN.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jack Palevich [Wed, 15 Apr 2009 02:00:09 +0000 (19:00 -0700)]
Improve glgen
+ gen script is really a bash script rather than a sh script,
so declare that to be true. (For example, it uses pushd,
which is a part of bash, but not a part of sh. Not sure
how this worked until now. Possibly gen was only run in
environments where /bin/sh was really bash.
+ Check the results of the java compile of the code generator,
and abort the script if the compile fails.
+ Turn on the bash shell option that guards against using
uninitialized variables in the script.
+ Remove the generated class files.
Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
Scott Main [Wed, 15 Apr 2009 00:23:06 +0000 (17:23 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 15 Apr 2009 00:21:49 +0000 (17:21 -0700)]
AI 146255: am: CL 146254 clarification for the minSdkVersion attribute;
added more information to the <uses-sdk> reference,
added a link to it from the <manifes> reference, and
revised some misleading information in the android 1.1 version notes
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146255
Scott Main [Wed, 15 Apr 2009 00:02:10 +0000 (17:02 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Wed, 15 Apr 2009 00:00:51 +0000 (17:00 -0700)]
AI 146251: am: CL 146242 fix the package namespace in the examples;
delete the old hello-android file
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146251
Guang Zhu [Tue, 14 Apr 2009 23:47:03 +0000 (16:47 -0700)]
Merge branch 'readonly-p4-donut' into donut
Guang Zhu [Tue, 14 Apr 2009 23:45:47 +0000 (16:45 -0700)]
AI 146246: am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early.
Original author: guangzhu
Merged from: //branches/cupcake/...
Automated import of CL 146246
Android (Google) Code Review [Tue, 14 Apr 2009 21:40:02 +0000 (14:40 -0700)]
Merge changes 108,130,131 into donut
* changes:
util/DebugUtils: Remove references to android.util.Config
text: Remove references to android.util.Config
Remove references to android.util.Config
Android (Google) Code Review [Tue, 14 Apr 2009 21:39:51 +0000 (14:39 -0700)]
Merge change 109 into donut
* changes:
Remove references to android.util.Config
Android (Google) Code Review [Tue, 14 Apr 2009 21:15:22 +0000 (14:15 -0700)]
Merge change 129 into donut
* changes:
Clean up trivial Eclipse warnings and fix whitespace.
Android (Google) Code Review [Tue, 14 Apr 2009 20:36:33 +0000 (13:36 -0700)]
Merge change 154 into donut
* changes:
gps: Add support for bringing up a GSM data connection on demand for SUPL.
Mike Lockwood [Tue, 14 Apr 2009 20:25:07 +0000 (16:25 -0400)]
gps: Add support for bringing up a GSM data connection on demand for SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Android (Google) Code Review [Tue, 14 Apr 2009 20:20:43 +0000 (13:20 -0700)]
Merge change 133 into donut
* changes:
Initial code for cdma sms encode and decode, in java, with simple tests.
Android (Google) Code Review [Tue, 14 Apr 2009 20:15:43 +0000 (13:15 -0700)]
Merge change 132 into donut
* changes:
Let's do bug #
1769910 actually right.
Android (Google) Code Review [Tue, 14 Apr 2009 19:52:28 +0000 (12:52 -0700)]
Merge change 142 into donut
* changes:
telephony: Add support for bringing up GSM data connections for GPS SUPL.
Mike Lockwood [Tue, 14 Apr 2009 14:56:36 +0000 (10:56 -0400)]
telephony: Add support for bringing up GSM data connections for GPS SUPL.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ramanan Rajeswaran [Tue, 14 Apr 2009 18:07:13 +0000 (11:07 -0700)]
Merge branch 'readonly-p4-donut' into donut
Ramanan Rajeswaran [Tue, 14 Apr 2009 17:41:57 +0000 (10:41 -0700)]
AI 146145: am: CL 146144 Set default map location for Ireland and South Africa
Original author: ramanan
Merged from: //branches/cupcake/...
Automated import of CL 146145
Ramanan Rajeswaran [Tue, 14 Apr 2009 16:48:58 +0000 (09:48 -0700)]
Merge branch 'readonly-p4-donut' into donut
Ramanan Rajeswaran [Tue, 14 Apr 2009 16:47:42 +0000 (09:47 -0700)]
AI 146129: am: CL 146127 Increase zoom level for NZ default maps location
Original author: ramanan
Merged from: //branches/cupcake/...
Automated import of CL 146129
Ramanan Rajeswaran [Tue, 14 Apr 2009 16:34:58 +0000 (09:34 -0700)]
Merge branch 'readonly-p4-donut' into donut
Ramanan Rajeswaran [Tue, 14 Apr 2009 16:33:40 +0000 (09:33 -0700)]
AI 146124: am: CL 146123 Change Belfast to Dublin
Original author: ramanan
Merged from: //branches/cupcake/...
Automated import of CL 146124
Android (Google) Code Review [Tue, 14 Apr 2009 04:37:13 +0000 (21:37 -0700)]
Merge change 105 into donut
* changes:
Fix crash when mSST is null and change default to GSM.
Wink Saville [Tue, 14 Apr 2009 04:15:23 +0000 (21:15 -0700)]
Fix crash when mSST is null and change default to GSM.
Tammo Spalink [Tue, 14 Apr 2009 02:01:23 +0000 (10:01 +0800)]
Initial code for cdma sms encode and decode, in java, with simple tests.
(direct cherry-pick of master 42/42/8)
Scott Main [Tue, 14 Apr 2009 01:47:22 +0000 (18:47 -0700)]
Merge branch 'readonly-p4-donut' into donut
Scott Main [Tue, 14 Apr 2009 01:46:08 +0000 (18:46 -0700)]
AI 146029: am: CL 146028 update hello world tutorial for cupcake, including various other edits.
Original author: smain
Merged from: //branches/cupcake/...
Automated import of CL 146029
Dianne Hackborn [Tue, 14 Apr 2009 01:42:49 +0000 (18:42 -0700)]
Let's do bug #
1769910 actually right.
My original implementation was computing averages and medians. Now we do binning, as requested. So much simpler, too! In addition, it fixes a bug where when hoping across activities we were only accounting for the last activity as the total time; now we count the time from the start of the initial activity.
This also includes some reduction and optimization of the activity manager dumpsys output.
Robert Greenwalt [Tue, 14 Apr 2009 01:36:18 +0000 (18:36 -0700)]
Merge branch 'readonly-p4-donut' into donut
Robert Greenwalt [Tue, 14 Apr 2009 01:35:04 +0000 (18:35 -0700)]
AI 145995: am: CL 145993 Fix Phone-oriented default-locale selection.
When several locales for a given language are available we were always
selecting the first.
Original author: rgreenwalt
Merged from: //branches/cupcake/...
Automated import of CL 145995