OSDN Git Service
Neal Nguyen [Thu, 6 May 2010 23:31:27 +0000 (16:31 -0700)]
am
ad0830a1: am
639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '
ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken
* commit '
ad0830a136e1a205be42f18c4b779e50c9ac1985':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Neal Nguyen [Thu, 6 May 2010 23:12:22 +0000 (16:12 -0700)]
am
639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '
639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp
* commit '
639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
The Android Open Source Project [Thu, 6 May 2010 22:22:17 +0000 (15:22 -0700)]
am
f4dffd8a: merge from open-source master
Merge commit '
f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken
* commit '
f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
Telephony: Add PUK MMI code support for CDMA RUIM phones
Type Zero Sms should not be displayed/stored/notified.
The Android Open Source Project [Thu, 6 May 2010 22:18:59 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
Neal Nguyen [Thu, 6 May 2010 20:45:18 +0000 (13:45 -0700)]
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Andreas Huber [Thu, 6 May 2010 19:43:59 +0000 (12:43 -0700)]
am
71bd9fc8: am
100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '
71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken
* commit '
71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
Disable vorbis seek when streaming from localhost.
Dirk Dougherty [Thu, 6 May 2010 19:43:56 +0000 (12:43 -0700)]
am
8b6ac78e: am
5305627d: Doc change: New doc that describes how market filters work
Merge commit '
8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc' into kraken
* commit '
8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc':
Doc change: New doc that describes how market filters work
Dan Bornstein [Thu, 6 May 2010 19:43:52 +0000 (12:43 -0700)]
am
89ad07b0: am
42ee86e6: Merge "For issue #
2651381, allow library prelinking." into froyo
Merge commit '
89ad07b048ff035394596d6a8916f639f3f0b868' into kraken
* commit '
89ad07b048ff035394596d6a8916f639f3f0b868':
For issue #
2651381, allow library prelinking.
Neal Nguyen [Thu, 6 May 2010 19:43:48 +0000 (12:43 -0700)]
am
e96e2358: am
f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit '
e96e235865830e2f0ee54e22feb20f26c3390999' into kraken
* commit '
e96e235865830e2f0ee54e22feb20f26c3390999':
Adding a few host-based stress tests for Apps on SD.
Andreas Huber [Thu, 6 May 2010 19:36:13 +0000 (12:36 -0700)]
am
100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '
100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp
* commit '
100ef9bee48c9beb83d885d233de6a42c64f55af':
Disable vorbis seek when streaming from localhost.
Dirk Dougherty [Thu, 6 May 2010 19:36:10 +0000 (12:36 -0700)]
am
5305627d: Doc change: New doc that describes how market filters work
Merge commit '
5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp
* commit '
5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
Doc change: New doc that describes how market filters work
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.
Andreas Huber [Thu, 6 May 2010 18:27:35 +0000 (11:27 -0700)]
Merge "Disable vorbis seek when streaming from localhost." into froyo
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
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Suchi Amalapurapu [Thu, 6 May 2010 00:52:25 +0000 (17:52 -0700)]
am
9dfc6971: am
df7ccbc8: Merge "Fix
2656989. Clean up update to updated system applications." into froyo
Merge commit '
9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken
* commit '
9dfc6971631e306f6eec62b7c5f423ef52138b9c':
Fix
2656989. Clean up update to updated system applications.
Dan Bornstein [Thu, 6 May 2010 00:52:22 +0000 (17:52 -0700)]
am
2a1674b1: am
2d315667: For issue #
2651381, allow library prelinking.
Merge commit '
2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken
* commit '
2a1674b1d00fda68980ec834d6ce61aacd379bc8':
For issue #
2651381, allow library prelinking.
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
Jean-Baptiste Queru [Wed, 5 May 2010 23:30:53 +0000 (16:30 -0700)]
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
Jean-Baptiste Queru [Wed, 5 May 2010 23:18:30 +0000 (16:18 -0700)]
Merge "Type Zero Sms should not be displayed/stored/notified."
The Android Open Source Project [Wed, 5 May 2010 23:00:01 +0000 (16:00 -0700)]
am
f7896449: merge from open-source master
Merge commit '
f78964490d8098387d51444c87bf520ad3f674e2' into kraken
* commit '
f78964490d8098387d51444c87bf520ad3f674e2':
Add new keycodes for the convenience of Japanese IMEs
Call register_localized_collators() with the current locale.
Fixed deserialization problem in DatePicker.
Fix for bug
2467152 files with spaces fail to open.
Set alpha value for newly created dim surface.
telephony: Fix CID when CID is unknown
The Android Open Source Project [Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)]
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Jaikumar Ganesh [Wed, 5 May 2010 22:25:54 +0000 (15:25 -0700)]
Merge "Add UUID property for adapter." into kraken
Dianne Hackborn [Wed, 5 May 2010 22:18:59 +0000 (15:18 -0700)]
Merge "First pass at NativeActivity." into kraken
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:06:12 +0000 (12:06 -0700)]
am
fc12b5be: 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 '
fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken
* commit '
fc12b5be2ee49ba2392274d413bd5d759c03c346':
Fix bug
2594126 Do not crash when ViewRoot is trying to play a UI
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
James Dong [Wed, 5 May 2010 18:40:51 +0000 (11:40 -0700)]
Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken
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:29:39 +0000 (09:29 -0700)]
am
9aa12f85: am
a69e10db: fix doc bug in hello gallery tutorial
Merge commit '
9aa12f85bef352bbc528fbee2ccd7350a2f30394' into kraken
* commit '
9aa12f85bef352bbc528fbee2ccd7350a2f30394':
fix doc bug in hello gallery tutorial
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:30:51 +0000 (18:30 -0700)]
am
3445dae3: am
65b2561c: Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '
3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken
* commit '
3445dae3f52fa8421e3b93496ac93c5753a43bd2':
Fix issue #
2643754: Launcher is caching widget layouts for too long
Bjorn Bringert [Wed, 5 May 2010 01:30:47 +0000 (18:30 -0700)]
am
0c698e6e: am
c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '
0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken
* commit '
0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
Build searchables list after boot
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:06:57 +0000 (16:06 -0700)]
am
0915d0aa: am
5e5202bd: Merge "docs: resolve doc bug bug:
2648699" into froyo
Merge commit '
0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken
* commit '
0915d0aa9c13b365d48c6868ac47913ecd172d07':
docs: resolve doc bug
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
Jaikumar Ganesh [Tue, 4 May 2010 22:53:31 +0000 (15:53 -0700)]
Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
Adam Powell [Tue, 4 May 2010 22:41:41 +0000 (15:41 -0700)]
am
d135f74b: am
151af19b: Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '
d135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken
* commit '
d135f74b972b88de2ae8b11b3ada886d29c1e25d':
Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
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."
James Dong [Tue, 4 May 2010 21:40:28 +0000 (14:40 -0700)]
Merge "Support AAC recording" into kraken
Andreas Huber [Tue, 4 May 2010 21:30:34 +0000 (14:30 -0700)]
am
8ea45aad: am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Merge commit '
8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '
8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
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:22:47 +0000 (14:22 -0700)]
am
5c16039a: am
01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
Merge commit '
5c16039adfe3da2d9438b8814734f5c8d2570ad3' into kraken
* commit '
5c16039adfe3da2d9438b8814734f5c8d2570ad3':
docs: revise and add documentation for backup APIs
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:45:53 +0000 (12:45 -0700)]
am
342a3800: am
70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
Merge commit '
342a3800b9b31929b337d298a24184d820f27f26' into kraken
* commit '
342a3800b9b31929b337d298a24184d820f27f26':
Increase the row height of menus by 1dip.
Dan Morrill [Tue, 4 May 2010 19:45:49 +0000 (12:45 -0700)]
am
f7ebcfec: am
e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
Merge commit '
f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken
* commit '
f7ebcfeccbd4433be5252857a854a6b565bf3fb9':
Adding the backward-compatible filtering heuristics for the new device
Joe Onorato [Tue, 4 May 2010 19:45:44 +0000 (12:45 -0700)]
am
77da7312: am
f140be6c: Call into app widget hosts when the provider is updated.
Merge commit '
77da7312215c4a433e3f53c2fe306307fc3bad52' into kraken
* commit '
77da7312215c4a433e3f53c2fe306307fc3bad52':
Call into app widget hosts when the provider is updated.
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:27:35 +0000 (09:27 -0700)]
am
6de3a6fd: merge from open-source master
Merge commit '
6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken
* commit '
6de3a6fdd303b15ad944570daf37faa798dc1989':
Fix typo of <p> end tag in appwidgets.xml
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:25:15 +0000 (16:25 -0700)]
am
007ad770: merge from open-source master
Merge commit '
007ad7700a23ff7e618cfeee1eab97063c93b800' into kraken
* commit '
007ad7700a23ff7e618cfeee1eab97063c93b800':
Adapt to new location of libcore
Parse custom text header and ignore it.
Parse "multipart/vnd.wap.multipart.alternative" which is a part of multipart body (nested multipart).
'uses-library' was not working for persistent applications.
Fix an NPE in InputMethodService when mExtractAction is null.
The Android Open Source Project [Mon, 3 May 2010 23:19:19 +0000 (16:19 -0700)]
merge from open-source master
Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
Jean-Baptiste Queru [Sun, 2 May 2010 23:11:32 +0000 (16:11 -0700)]
am
2529d4ea: Adapt to new location of libcore
Merge commit '
2529d4eab80778aef9c7a9fe27712a41686d22c4' into kraken
* commit '
2529d4eab80778aef9c7a9fe27712a41686d22c4':
Adapt to new location of libcore
Xia Wang [Fri, 30 Apr 2010 22:49:23 +0000 (15:49 -0700)]
Merge "Fix test in PhoneNumberUtilsUnitTest.java, combine it with PhoneNumberUtilsTest.java Rename CallerInfoUnitTest.java to CallerInfoTest.java and move to the corresponding directory" into kraken
Mathias Agopian [Fri, 30 Apr 2010 19:59:21 +0000 (12:59 -0700)]
make sure the server-side validates pointers/indices visible on the client side
Change-Id: I604f58d3fcd2d09ec7998123c627401081345cd6
Mathias Agopian [Fri, 30 Apr 2010 19:58:11 +0000 (12:58 -0700)]
Merge "Add support for enqueuing buffers in arbitrary order" into kraken
Daniel Sandler [Fri, 30 Apr 2010 18:34:03 +0000 (11:34 -0700)]
am
d47cdbb7: am
3bb5e4d3: Merge "Tweak style of recent apps dialog title." into froyo
Merge commit '
d47cdbb7ea97a6ed3b428d913fa45883904d0ba8' into kraken
* commit '
d47cdbb7ea97a6ed3b428d913fa45883904d0ba8':
Tweak style of recent apps dialog title.
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:24:25 +0000 (21:24 -0700)]
am
27963bbc: am
cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '
27963bbc25278885f57965f6bf8250d6eeabd94a' into kraken
* commit '
27963bbc25278885f57965f6bf8250d6eeabd94a':
docs: editorial revisions to the bmgr tool doc
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
Dianne Hackborn [Fri, 30 Apr 2010 00:59:17 +0000 (17:59 -0700)]
Merge "Fix build." into kraken
Marc Blank [Thu, 29 Apr 2010 23:28:50 +0000 (16:28 -0700)]
am
9ca81664: am
794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '
9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken
* commit '
9ca816649bd2af7d540f375be8fcc503c50aef72':
Expose _id in ExtendedProperties subValues
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:31:23 +0000 (15:31 -0700)]
am
48399e38: am
77a1beb1: Merge "Import revised translations" into froyo
Merge commit '
48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken
* commit '
48399e38c978a66ac4c6054c8681a246dfc94b4b':
Import revised translations
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:25:31 +0000 (15:25 -0700)]
am
1d328033: am
764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '
1d328033277aef352a80f06f3520a86cbdc9c48f' into kraken
* commit '
1d328033277aef352a80f06f3520a86cbdc9c48f':
docs: rewrite information about using shared preferences, internal and
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
Mathias Agopian [Thu, 29 Apr 2010 21:17:12 +0000 (14:17 -0700)]
Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken
Mathias Agopian [Thu, 29 Apr 2010 21:16:14 +0000 (14:16 -0700)]
Merge "fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly." into kraken
Dianne Hackborn [Thu, 29 Apr 2010 19:22:52 +0000 (12:22 -0700)]
am
d8f34720: am
c956f375: Fix issue #
2641875: Apps on sdcard not accesible after update
Merge commit '
d8f34720a1eb87770c854928410c753e0969d3ac' into kraken
* commit '
d8f34720a1eb87770c854928410c753e0969d3ac':
Fix issue #
2641875: Apps on sdcard not accesible after update
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:38:41 +0000 (19:38 -0700)]
am
6483f6d5: am
b40c42f1: Fix bug
2639949 - Don\'t stop a Scroller early
Merge commit '
6483f6d546655a9579670b42d445614cab609e28' into kraken
* commit '
6483f6d546655a9579670b42d445614cab609e28':
Fix bug
2639949 - Don't stop a Scroller early
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
Dianne Hackborn [Sat, 24 Apr 2010 00:51:26 +0000 (17:51 -0700)]
New xlarge screen size.
Not complete, only for experimentation at this point.
This includes a reworking of how screen size configurations are matched,
so that if you are on a larger screen we can select configurations for
smaller screens if there aren't any exactly matching the current screen.
The screen size at which we switch to xlarge has been arbitrarily
chosen; the compatibility behavior has not yet been defined.
Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
OSDN Git Service
