OSDN Git Service
Dan Bornstein [Thu, 6 May 2010 19:36:05 +0000 (12:36 -0700)]
am
42ee86e6: Merge "For issue #
2651381, allow library prelinking." into froyo
Merge commit '
42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp
* commit '
42ee86e66d972dcdf240e549e5fdc151a144af64':
For issue #
2651381, allow library prelinking.
Neal Nguyen [Thu, 6 May 2010 19:36:01 +0000 (12:36 -0700)]
am
f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit '
f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp
* commit '
f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
Adding a few host-based stress tests for Apps on SD.
Dan Bornstein [Thu, 6 May 2010 17:01:39 +0000 (10:01 -0700)]
Merge "For issue #
2651381, allow library prelinking." into froyo
Neal Nguyen [Thu, 6 May 2010 16:44:10 +0000 (09:44 -0700)]
Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Suchi Amalapurapu [Thu, 6 May 2010 00:50:34 +0000 (17:50 -0700)]
am
df7ccbc8: Merge "Fix
2656989. Clean up update to updated system applications." into froyo
Merge commit '
df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp
* commit '
df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
Fix
2656989. Clean up update to updated system applications.
Dan Bornstein [Thu, 6 May 2010 00:50:28 +0000 (17:50 -0700)]
am
2d315667: For issue #
2651381, allow library prelinking.
Merge commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp
* commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2':
For issue #
2651381, allow library prelinking.
Suchi Amalapurapu [Thu, 6 May 2010 00:38:58 +0000 (17:38 -0700)]
Merge "Fix
2656989. Clean up update to updated system applications." into froyo
The Android Open Source Project [Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)]
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Jean-Baptiste Queru [Wed, 5 May 2010 20:49:58 +0000 (13:49 -0700)]
Merge "Add new keycodes for the convenience of Japanese IMEs"
mogimo [Fri, 2 Oct 2009 18:13:56 +0000 (03:13 +0900)]
Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
Jean-Baptiste Queru [Wed, 5 May 2010 20:15:24 +0000 (13:15 -0700)]
Merge "telephony: Fix CID when CID is unknown"
Jean-Michel Trivi [Wed, 5 May 2010 19:03:43 +0000 (12:03 -0700)]
am
b5fa4dff: Merge "Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit '
b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp
* commit '
b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI
Jean-Michel Trivi [Wed, 5 May 2010 19:02:18 +0000 (12:02 -0700)]
Merge "Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn't fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Jean-Baptiste Queru [Wed, 5 May 2010 18:16:31 +0000 (11:16 -0700)]
Merge "Call register_localized_collators() with the current locale."
Scott Main [Wed, 5 May 2010 16:27:50 +0000 (09:27 -0700)]
am
a69e10db: fix doc bug in hello gallery tutorial
Merge commit '
a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp
* commit '
a69e10db2fb58deb5e27aa67c46d267af928374b':
fix doc bug in hello gallery tutorial
Dianne Hackborn [Wed, 5 May 2010 06:58:26 +0000 (23:58 -0700)]
Merge "Set alpha value for newly created dim surface."
Dianne Hackborn [Wed, 5 May 2010 01:22:39 +0000 (18:22 -0700)]
am
65b2561c: Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '
65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp
* commit '
65b2561c3bd74b639df0fead2041c775b7f40000':
Fix issue #
2643754: Launcher is caching widget layouts for too long
Bjorn Bringert [Wed, 5 May 2010 01:22:36 +0000 (18:22 -0700)]
am
c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp
* commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf':
Build searchables list after boot
Dianne Hackborn [Wed, 5 May 2010 00:43:25 +0000 (17:43 -0700)]
Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Bjorn Bringert [Tue, 4 May 2010 23:57:56 +0000 (16:57 -0700)]
Merge "Build searchables list after boot" into froyo
Scott Main [Tue, 4 May 2010 23:04:46 +0000 (16:04 -0700)]
am
5e5202bd: Merge "docs: resolve doc bug bug:
2648699" into froyo
Merge commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
Scott Main [Tue, 4 May 2010 23:03:37 +0000 (16:03 -0700)]
Merge "docs: resolve doc bug bug:
2648699" into froyo
Adam Powell [Tue, 4 May 2010 22:40:36 +0000 (15:40 -0700)]
am
151af19b: Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '
151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp
* commit '
151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Jean-Baptiste Queru [Tue, 4 May 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Fix for bug
2467152 files with spaces fail to open."
Andreas Huber [Tue, 4 May 2010 21:29:04 +0000 (14:29 -0700)]
am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Merge commit '
e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit '
e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
Andreas Huber [Tue, 4 May 2010 21:27:26 +0000 (14:27 -0700)]
Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Scott Main [Tue, 4 May 2010 21:21:21 +0000 (14:21 -0700)]
am
01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '
014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp
* commit '
014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
docs: revise and add documentation for backup APIs
Scott Main [Tue, 4 May 2010 21:20:02 +0000 (14:20 -0700)]
Merge "docs: revise and add documentation for backup APIs" into froyo
Daniel Sandler [Tue, 4 May 2010 19:42:48 +0000 (12:42 -0700)]
am
70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '
70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp
* commit '
70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
Increase the row height of menus by 1dip.
Daniel Sandler [Tue, 4 May 2010 19:40:54 +0000 (12:40 -0700)]
Merge "Increase the row height of menus by 1dip." into froyo
Dan Morrill [Tue, 4 May 2010 19:38:03 +0000 (12:38 -0700)]
am
e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit '
e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp
* commit '
e17b4e711571198f79c0c2bad3656d58c63629e8':
Adding the backward-compatible filtering heuristics for the new device
Joe Onorato [Tue, 4 May 2010 19:37:59 +0000 (12:37 -0700)]
am
f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '
f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp
* commit '
f140be6c3c21dd0f6d2214929e89d60de31d2c04':
Call into app widget hosts when the provider is updated.
Dan Morrill [Tue, 4 May 2010 19:03:45 +0000 (12:03 -0700)]
Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
The Android Open Source Project [Tue, 4 May 2010 16:20:16 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I5f552b45caae639170674213c23f154437b58afd
Romain Guy [Mon, 3 May 2010 23:25:34 +0000 (16:25 -0700)]
Merge "Fix typo of <p> end tag in appwidgets.xml"
The Android Open Source Project [Mon, 3 May 2010 23:19:19 +0000 (16:19 -0700)]
merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
Daniel Sandler [Fri, 30 Apr 2010 18:30:29 +0000 (11:30 -0700)]
am
3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit '
3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e' into froyo-plus-aosp
* commit '
3bb5e4d322a6a7cda45e868dbe307c2dc3cf688e':
Tweak style of recent apps dialog title.
Daniel Sandler [Fri, 30 Apr 2010 17:55:03 +0000 (10:55 -0700)]
Merge "Tweak style of recent apps dialog title." into froyo
Scott Main [Fri, 30 Apr 2010 04:23:10 +0000 (21:23 -0700)]
am
cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp
* commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
docs: editorial revisions to the bmgr tool doc
Scott Main [Fri, 30 Apr 2010 04:22:17 +0000 (21:22 -0700)]
Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Marc Blank [Thu, 29 Apr 2010 22:40:30 +0000 (15:40 -0700)]
am
794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp
* commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162':
Expose _id in ExtendedProperties subValues
Marc Blank [Thu, 29 Apr 2010 22:39:37 +0000 (15:39 -0700)]
Merge "Expose _id in ExtendedProperties subValues" into froyo
Kenny Root [Thu, 29 Apr 2010 22:29:22 +0000 (15:29 -0700)]
am
77a1beb1: Merge "Import revised translations" into froyo
Merge commit '
77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp
* commit '
77a1beb137948ad45423bb8fcd7e424e36144133':
Import revised translations
Kenny Root [Thu, 29 Apr 2010 22:28:15 +0000 (15:28 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Thu, 29 Apr 2010 22:23:32 +0000 (15:23 -0700)]
am
764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '
764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp
* commit '
764caf2481d935ce6870ec141f1e845178df8b47':
docs: rewrite information about using shared preferences, internal and
Scott Main [Thu, 29 Apr 2010 22:21:34 +0000 (15:21 -0700)]
Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Dianne Hackborn [Thu, 29 Apr 2010 19:20:42 +0000 (12:20 -0700)]
am
c956f375: Fix issue #
2641875: Apps on sdcard not accesible after update
Merge commit '
c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp
* commit '
c956f37567593a71271bae107eafec47575f7dcc':
Fix issue #
2641875: Apps on sdcard not accesible after update
Jean-Baptiste Queru [Thu, 29 Apr 2010 17:03:40 +0000 (10:03 -0700)]
Merge "Fix an NPE in InputMethodService when mExtractAction is null."
Adam Powell [Thu, 29 Apr 2010 02:34:49 +0000 (19:34 -0700)]
am
b40c42f1: Fix bug
2639949 - Don\'t stop a Scroller early
Merge commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp
* commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d':
Fix bug
2639949 - Don't stop a Scroller early
Steve Howard [Wed, 28 Apr 2010 23:03:28 +0000 (16:03 -0700)]
am
81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '
81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp
* commit '
81ac367be66905a5b53b8e7e98160546802bd98b':
Fix a minor bug in transitions to left-edge-up landscape.
Steve Howard [Wed, 28 Apr 2010 22:59:39 +0000 (15:59 -0700)]
Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
The Android Open Source Project [Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)]
merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
Vasu Nori [Wed, 28 Apr 2010 22:38:44 +0000 (15:38 -0700)]
am
a07c4cbe: Merge "bug:
2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp
* commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
bug:
2622719 move 'forcing of cursor execution' to ContentProvider
Vasu Nori [Wed, 28 Apr 2010 22:35:57 +0000 (15:35 -0700)]
Merge "bug:
2622719 move 'forcing of cursor execution' to ContentProvider" into froyo
Amith Yamasani [Wed, 28 Apr 2010 22:21:37 +0000 (15:21 -0700)]
am
6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Merge commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681
Amith Yamasani [Wed, 28 Apr 2010 22:18:15 +0000 (15:18 -0700)]
Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Fred Quintana [Wed, 28 Apr 2010 21:13:55 +0000 (14:13 -0700)]
am
9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814':
revert a change in the SyncManager that caused it to not cancel
Fred Quintana [Wed, 28 Apr 2010 21:10:05 +0000 (14:10 -0700)]
Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Dianne Hackborn [Wed, 28 Apr 2010 20:14:43 +0000 (13:14 -0700)]
am
bc5a0328: Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit '
bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp
* commit '
bc5a03286a72dc3627cee313d473178f5a123049':
Fix issue #
2569139: Sapphire user cannot login to last.fm...
Dianne Hackborn [Wed, 28 Apr 2010 19:42:00 +0000 (12:42 -0700)]
Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Kenny Root [Wed, 28 Apr 2010 16:32:55 +0000 (09:32 -0700)]
am
4bba2149: Merge "Import revised translations" into froyo
Merge commit '
4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp
* commit '
4bba2149f3f2709b24dc40118461c5d683ed6965':
Import revised translations
Scott Main [Wed, 28 Apr 2010 16:31:28 +0000 (09:31 -0700)]
am
eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp
Merge commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp
* commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
docs: update information about developing on a device.
Kenny Root [Wed, 28 Apr 2010 15:05:03 +0000 (08:05 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Wed, 28 Apr 2010 01:35:53 +0000 (18:35 -0700)]
Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo
Vasu Nori [Tue, 27 Apr 2010 23:49:29 +0000 (16:49 -0700)]
am
996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp
* commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
remove myname accidentally included in one of the files
Vasu Nori [Tue, 27 Apr 2010 23:44:58 +0000 (16:44 -0700)]
Merge "remove myname accidentally included in one of the files" into froyo
Dianne Hackborn [Tue, 27 Apr 2010 23:42:42 +0000 (16:42 -0700)]
am
e367896e: Merge "Fix issue #
2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '
e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp
* commit '
e367896e91a0d75250f00f2de3929495595719d4':
Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()
Dianne Hackborn [Tue, 27 Apr 2010 23:39:44 +0000 (16:39 -0700)]
Merge "Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo
Shimeng (Simon) Wang [Tue, 27 Apr 2010 19:34:03 +0000 (12:34 -0700)]
am
05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp
* commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14':
Add good international characters to the path part of Url pattern.
Adam Powell [Tue, 27 Apr 2010 19:08:01 +0000 (12:08 -0700)]
am
2ea21a84: Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Merge commit '
2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp
* commit '
2ea21a84ef81849153f30bbea213acd5be110c08':
Fix a WebView scrolling regression - bug
2633572.
Adam Powell [Tue, 27 Apr 2010 19:05:40 +0000 (12:05 -0700)]
Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Fred Quintana [Tue, 27 Apr 2010 18:59:12 +0000 (11:59 -0700)]
am
6ce78924: Merge "Add JavaDoc for SyncResult b/
2420252" into froyo
Merge commit '
6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp
* commit '
6ce78924ebd179611c71122b864807dc4525f593':
Add JavaDoc for SyncResult
Fred Quintana [Tue, 27 Apr 2010 18:56:16 +0000 (11:56 -0700)]
Merge "Add JavaDoc for SyncResult b/
2420252" into froyo
San Mehat [Tue, 27 Apr 2010 18:13:56 +0000 (11:13 -0700)]
am
57fff78a: dumpstate: Add blocked process wait-channel info to bugreport
Merge commit '
57fff78a70c82ca09beb91c4f92d97b6f0b897e4' into froyo-plus-aosp
* commit '
57fff78a70c82ca09beb91c4f92d97b6f0b897e4':
dumpstate: Add blocked process wait-channel info to bugreport
Dianne Hackborn [Tue, 27 Apr 2010 01:54:06 +0000 (18:54 -0700)]
am
2e4b98dc: Merge "Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Merge commit '
2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp
* commit '
2e4b98dcd88f14fdb35e46236ec916493c570f28':
Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Dianne Hackborn [Tue, 27 Apr 2010 01:51:31 +0000 (18:51 -0700)]
Merge "Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Jean-Michel Trivi [Tue, 27 Apr 2010 01:05:28 +0000 (18:05 -0700)]
am
cd24dae9: Merge "Fix bug
2605504 Don\'t leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. T
Merge commit '
cd24dae9ca6550b24333f889935e1de068759ce5' into froyo-plus-aosp
* commit '
cd24dae9ca6550b24333f889935e1de068759ce5':
Fix bug
2605504 Don't leak a metric ton of NotificationPlayer threads
Jean-Michel Trivi [Tue, 27 Apr 2010 01:02:35 +0000 (18:02 -0700)]
Merge "Fix bug
2605504 Don't leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. The fix consists in quitting the Looper used for the previous sound when a new sound is started." into froyo
Dianne Hackborn [Tue, 27 Apr 2010 01:00:08 +0000 (18:00 -0700)]
am
3202d380: Fix issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Merge commit '
3202d380226043fa665df3c92252f791f8c52d55' into froyo-plus-aosp
* commit '
3202d380226043fa665df3c92252f791f8c52d55':
Fix issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Marco Nelissen [Tue, 27 Apr 2010 00:19:58 +0000 (17:19 -0700)]
am
8138cb49: Make Surface.toString() show more useful info to help debug bug
2594388.
Merge commit '
8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp
* commit '
8138cb49e47f9a9905a316a217757710185c66aa':
Make Surface.toString() show more useful info to help debug bug
2594388.
Robert Greenwalt [Mon, 26 Apr 2010 22:43:27 +0000 (15:43 -0700)]
am
27fba679: Fix Throttle reset.
Merge commit '
27fba6797b07583ef6c280bc287bf327e47f5e66' into froyo-plus-aosp
* commit '
27fba6797b07583ef6c280bc287bf327e47f5e66':
Fix Throttle reset.
Robert Greenwalt [Mon, 26 Apr 2010 18:18:45 +0000 (11:18 -0700)]
am
19681af4: Merge "Handle throttling being disabled via policy change" into froyo
Merge commit '
19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '
19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
Robert Greenwalt [Mon, 26 Apr 2010 18:13:11 +0000 (11:13 -0700)]
Merge "Handle throttling being disabled via policy change" into froyo
James Dong [Mon, 26 Apr 2010 18:05:19 +0000 (11:05 -0700)]
am
374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
Merge commit '
374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp
* commit '
374aee6888edddc5bcac9a644ad3de812404d3bc':
Switch to use software MP3 decoder
Bjorn Bringert [Mon, 26 Apr 2010 17:05:57 +0000 (10:05 -0700)]
am
cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
Merge commit '
cb4c894afa497943258cfb053ca35436f7b8e29a' into froyo-plus-aosp
* commit '
cb4c894afa497943258cfb053ca35436f7b8e29a':
bugfix for: OOM error while doing voice search repeatedly
Bjorn Bringert [Mon, 26 Apr 2010 14:52:57 +0000 (07:52 -0700)]
Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
Grace Kloba [Sat, 24 Apr 2010 00:14:49 +0000 (17:14 -0700)]
am
87782f2b: Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#
Merge commit '
87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp
* commit '
87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
Restrict the range request to the servers claiming
Raphael [Sat, 24 Apr 2010 00:14:21 +0000 (17:14 -0700)]
am
29355534: Fix aapt to build in Windows SDK under Linux
Merge commit '
29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp
* commit '
29355534384ee24bfe9a3bc97d7664dbe478b4fb':
Fix aapt to build in Windows SDK under Linux
Grace Kloba [Sat, 24 Apr 2010 00:14:15 +0000 (17:14 -0700)]
am
85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
Merge commit '
85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp
* commit '
85a8dcec5460edda72e9917d4f02ad1b6a133251':
Only honor the scrollbar mode at the minimum zoom
Grace Kloba [Fri, 23 Apr 2010 23:19:22 +0000 (16:19 -0700)]
Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo
Grace Kloba [Fri, 23 Apr 2010 22:27:58 +0000 (15:27 -0700)]
Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
Dianne Hackborn [Fri, 23 Apr 2010 22:22:55 +0000 (15:22 -0700)]
am
8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Dianne Hackborn [Fri, 23 Apr 2010 22:19:34 +0000 (15:19 -0700)]
Merge "Fix typo when parsing external platform version from Settings." into froyo
Jean-Michel Trivi [Fri, 23 Apr 2010 21:50:55 +0000 (14:50 -0700)]
am
47dad8fa: Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp
* commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
Fix bug
2619062 Music is routed to Phone speaker, though it is
Jean-Michel Trivi [Fri, 23 Apr 2010 21:48:10 +0000 (14:48 -0700)]
Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Dianne Hackborn [Fri, 23 Apr 2010 21:25:05 +0000 (14:25 -0700)]
am
2adec762: Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Merge commit '
2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp
* commit '
2adec762fbb61c73f612acb7463ba765de1296ad':
Fix issue #
2621809: Kill! Kill! Kill!
Neal Nguyen [Fri, 23 Apr 2010 21:25:01 +0000 (14:25 -0700)]
am
5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '
5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp
* commit '
5fa65082f16741394dcfbe756e3880d5c018dace':
Re-enabling unit tests for PackageManager/Apps on SD.
Dianne Hackborn [Fri, 23 Apr 2010 21:23:39 +0000 (14:23 -0700)]
Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Neal Nguyen [Fri, 23 Apr 2010 21:21:53 +0000 (14:21 -0700)]
Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Robert Greenwalt [Fri, 23 Apr 2010 20:52:18 +0000 (13:52 -0700)]
am
0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp
* commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68':
Respond to changes in throttle policy.
OSDN Git Service
