OSDN Git Service
Irfan Sheriff [Wed, 26 May 2010 20:04:11 +0000 (13:04 -0700)]
am
9ecca85f: Merge "Fix escaping of characters" into froyo
Merge commit '
9ecca85f0613032590c6840cae48b54f3d626181' into froyo-plus-aosp
* commit '
9ecca85f0613032590c6840cae48b54f3d626181':
Fix escaping of characters
Irfan Sheriff [Wed, 26 May 2010 20:02:06 +0000 (13:02 -0700)]
Merge "Fix escaping of characters" into froyo
Yu Shan Emily Lau [Wed, 26 May 2010 00:42:29 +0000 (17:42 -0700)]
am
b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Merge commit '
b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp
* commit '
b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
Yu Shan Emily Lau [Wed, 26 May 2010 00:40:51 +0000 (17:40 -0700)]
Merge "Added the runtime parameters for the mediarecorder stress test. Set the total number of the stress loops of camera preview memory test to 200." into froyo
Robert Greenwalt [Tue, 25 May 2010 23:13:22 +0000 (16:13 -0700)]
am
d1055a25: Make the NTP Cache max-age gservices-settable
Merge commit '
d1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit '
d1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
Adam Powell [Mon, 24 May 2010 23:23:53 +0000 (16:23 -0700)]
am
7e5e3745: Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '
7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '
7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug
2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Dirk Dougherty [Mon, 24 May 2010 16:56:47 +0000 (09:56 -0700)]
am
c7c7afd7: Doc change: Fix incorrect adt version reference etc.
Merge commit '
c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp
* commit '
c7c7afd7a1af36e787266815487f4600196406b8':
Doc change: Fix incorrect adt version reference etc.
Andreas Huber [Thu, 20 May 2010 18:13:20 +0000 (11:13 -0700)]
am
2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp
* commit '
2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Andreas Huber [Thu, 20 May 2010 18:11:39 +0000 (11:11 -0700)]
Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Xia Wang [Thu, 20 May 2010 17:56:13 +0000 (10:56 -0700)]
am
06906796: If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit '
069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '
069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
Dirk Dougherty [Thu, 20 May 2010 07:15:41 +0000 (00:15 -0700)]
am
dc737ca9: Doc change: Add new tv to carousel.
Merge commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit '
dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
Scott Main [Thu, 20 May 2010 03:25:15 +0000 (20:25 -0700)]
am
55f383a9: Merge "docs: add youtube video to highlights" into froyo
Merge commit '
55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '
55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
Scott Main [Thu, 20 May 2010 03:24:18 +0000 (20:24 -0700)]
Merge "docs: add youtube video to highlights" into froyo
Scott Main [Thu, 20 May 2010 02:30:29 +0000 (19:30 -0700)]
am
80259899: Merge "doc: add developing and testing info to backup guide" into froyo
Merge commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '
8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
Scott Main [Thu, 20 May 2010 02:29:19 +0000 (19:29 -0700)]
Merge "doc: add developing and testing info to backup guide" into froyo
Dirk Dougherty [Thu, 20 May 2010 01:58:03 +0000 (18:58 -0700)]
am
44108b54: Doc change: Move framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
Merge commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '
44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
Scott Main [Thu, 20 May 2010 01:06:51 +0000 (18:06 -0700)]
am
68728cb3: docs: add 2.2 platform highlights
Merge commit '
68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp
* commit '
68728cb3b44aba16abc298a37f6110ed00a781dd':
docs: add 2.2 platform highlights
Scott Main [Wed, 19 May 2010 19:09:04 +0000 (12:09 -0700)]
am
8d0e37f5: Merge "docs: revise platform intro" into froyo
Merge commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f' into froyo-plus-aosp
* commit '
8d0e37f5b142623b41b78ce5d19b4b650d53eb7f':
docs: revise platform intro
Scott Main [Wed, 19 May 2010 19:05:52 +0000 (12:05 -0700)]
Merge "docs: revise platform intro" into froyo
The Android Open Source Project [Wed, 19 May 2010 16:36:55 +0000 (09:36 -0700)]
merge from open-source master
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
The Android Open Source Project [Wed, 19 May 2010 16:32:44 +0000 (09:32 -0700)]
merge from open-source master
Change-Id: Ief641c7d7a7e82e90bba630c778582a0f9bd938b
The Android Open Source Project [Wed, 19 May 2010 16:20:22 +0000 (09:20 -0700)]
merge from open-source master
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
Romain Guy [Wed, 19 May 2010 16:03:57 +0000 (09:03 -0700)]
Merge "Don't allow invalid Uris to be added as observers."
The Android Open Source Project [Wed, 19 May 2010 15:39:13 +0000 (08:39 -0700)]
merge from open-source master
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
Jean-Baptiste Queru [Wed, 19 May 2010 15:35:21 +0000 (08:35 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed."
The Android Open Source Project [Wed, 19 May 2010 15:28:32 +0000 (08:28 -0700)]
merge from open-source master
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
The Android Open Source Project [Wed, 19 May 2010 15:15:54 +0000 (08:15 -0700)]
merge from open-source master
Change-Id: I34e8339dcf1bf658703d0d2f9656ceb66594af22
Romain Guy [Wed, 19 May 2010 07:03:34 +0000 (00:03 -0700)]
Merge "Add and document .nomedia constant for MediaStore (Issue 6365)"
Romain Guy [Wed, 19 May 2010 07:01:55 +0000 (00:01 -0700)]
Merge "Text disappears when selecting text in text editor."
Romain Guy [Wed, 19 May 2010 07:01:02 +0000 (00:01 -0700)]
Merge "Removed Calls to deprecated APIs"
Romain Guy [Wed, 19 May 2010 06:51:16 +0000 (23:51 -0700)]
Merge "Improved error handling when font loading fails."
Suchi Amalapurapu [Tue, 18 May 2010 21:53:37 +0000 (14:53 -0700)]
am
4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '
4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '
4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
Suchi Amalapurapu [Tue, 18 May 2010 21:51:55 +0000 (14:51 -0700)]
Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Jaikumar Ganesh [Tue, 18 May 2010 21:51:40 +0000 (14:51 -0700)]
am
ef95aceb: Merge "Removing STOPSHIP logs." into froyo
Merge commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp
* commit '
ef95acebdc44a7cf2990c4302850fcb112b695d2':
Removing STOPSHIP logs.
Jaikumar Ganesh [Tue, 18 May 2010 21:48:05 +0000 (14:48 -0700)]
Merge "Removing STOPSHIP logs." into froyo
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
Suchi Amalapurapu [Tue, 18 May 2010 20:16:13 +0000 (13:16 -0700)]
am
9a212adc: Fix
2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well.
Merge commit '
9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp
* commit '
9a212adcffbc4b32d51f512889b33ba584647aa9':
Fix
2641875
The Android Open Source Project [Tue, 18 May 2010 19:47:02 +0000 (12:47 -0700)]
merge from open-source master
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
The Android Open Source Project [Tue, 18 May 2010 18:08:12 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
Jean-Baptiste Queru [Tue, 18 May 2010 17:34:42 +0000 (10:34 -0700)]
Merge "Fix some typos and other cosmetic cleanups in telephony framework."
Jean-Baptiste Queru [Tue, 18 May 2010 17:14:14 +0000 (10:14 -0700)]
Merge "Abort FDN delete when number is empty (instead of name)"
The Android Open Source Project [Tue, 18 May 2010 16:18:37 +0000 (09:18 -0700)]
merge from open-source master
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
Scott Main [Tue, 18 May 2010 16:02:09 +0000 (09:02 -0700)]
am
5f1d1002: Merge "docs: fix markup error" into froyo
Merge commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp
* commit '
5f1d100298dfafbd996b6deff457e6d1de4008a0':
docs: fix markup error
Scott Main [Tue, 18 May 2010 15:59:03 +0000 (08:59 -0700)]
Merge "docs: fix markup error" into froyo
Scott Main [Tue, 18 May 2010 01:01:28 +0000 (18:01 -0700)]
am
e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Merge commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit '
e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
Scott Main [Tue, 18 May 2010 00:59:37 +0000 (17:59 -0700)]
Merge "docs: revise webview description and add info for targeting screen densities" into froyo
Dirk Dougherty [Tue, 18 May 2010 00:37:28 +0000 (17:37 -0700)]
am
6750bb7f: Doc change: add link to source.android.com
Merge commit '
6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp
* commit '
6750bb7f838b15ef25544d7aa66b17119fcd7227':
Doc change: add link to source.android.com
Dirk Dougherty [Tue, 18 May 2010 00:04:48 +0000 (17:04 -0700)]
am
6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard
Merge commit '
6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp
* commit '
6bb6348f2a542b05b9945f28566fb876cf6aee2e':
Doc change: cherry pick from eclair ->docs: add dashboard for screens
Mike Lockwood [Mon, 17 May 2010 21:56:53 +0000 (14:56 -0700)]
am
eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit '
eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp
* commit '
eb9cbb8fdddf4c887004b20b504083035d57a15f':
Resurrect flashlight support in obsolete IHardwareService Binder API.
Kenny Root [Mon, 17 May 2010 18:37:35 +0000 (11:37 -0700)]
am
cfa2de30: Import revised translations
Merge commit '
cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp
* commit '
cfa2de303e58b971e334363356d29601e61d11c8':
Import revised translations
The Android Open Source Project [Mon, 17 May 2010 17:38:00 +0000 (10:38 -0700)]
merge from open-source master
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
Jean-Baptiste Queru [Mon, 17 May 2010 16:12:43 +0000 (09:12 -0700)]
Merge "Updated RGB LED test cases"
The Android Open Source Project [Mon, 17 May 2010 15:56:54 +0000 (08:56 -0700)]
merge from open-source master
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
Romain Guy [Sat, 15 May 2010 19:34:05 +0000 (12:34 -0700)]
Merge "Fixing indeterminate progress bar animation state."
Chung-yih Wang [Sat, 15 May 2010 06:16:31 +0000 (23:16 -0700)]
am
5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit '
5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp
* commit '
5f1beda18fc7709c2e61ace33607513770faf115':
Make the SSID field of WifiConfiguration consistent with API description.
Chung-yih Wang [Sat, 15 May 2010 06:15:04 +0000 (23:15 -0700)]
Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Dianne Hackborn [Sat, 15 May 2010 06:11:33 +0000 (23:11 -0700)]
am
aa77de13: Fix issue #
2686193: Can\'t move apps to SD card
Merge commit '
aa77de1348cbda3d5348b15734ab141cb9c7759c' into froyo-plus-aosp
* commit '
aa77de1348cbda3d5348b15734ab141cb9c7759c':
Fix issue #
2686193: Can't move apps to SD card
Jeff Hamilton [Sat, 15 May 2010 02:36:40 +0000 (19:36 -0700)]
Merge "Modified libdrm to support SuperH platform"
Dirk Dougherty [Sat, 15 May 2010 01:42:11 +0000 (18:42 -0700)]
am
d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.
Merge commit '
d1e9d590941303c004459f3d798b26f1bf091535' into froyo-plus-aosp
* commit '
d1e9d590941303c004459f3d798b26f1bf091535':
Doc change: add sizes/sums for sdk/ndk/adt packages.
Andreas Huber [Fri, 14 May 2010 23:28:09 +0000 (16:28 -0700)]
am
eb9128f9: Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
Merge commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp
* commit '
eb9128f9b0ee660504621381fd96f82d5bf8a3fd':
Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
The Android Open Source Project [Fri, 14 May 2010 22:04:52 +0000 (15:04 -0700)]
merge from open-source master
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
Scott Main [Fri, 14 May 2010 21:24:44 +0000 (14:24 -0700)]
am
826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
Merge commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp
* commit '
826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
docs: fix broken link, reduce API info about backup and point to dev guide
Dirk Dougherty [Fri, 14 May 2010 21:00:12 +0000 (14:00 -0700)]
am
60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
Merge commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp
* commit '
60026c3ab0093e6d4cd464061ab9f36d4d041532':
Doc change: adjust compatibility doc.
Dirk Dougherty [Fri, 14 May 2010 20:58:12 +0000 (13:58 -0700)]
Merge "Doc change: adjust compatibility doc." into froyo
The Android Open Source Project [Fri, 14 May 2010 20:52:52 +0000 (13:52 -0700)]
merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
Dirk Dougherty [Fri, 14 May 2010 20:48:04 +0000 (13:48 -0700)]
am
59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
Merge commit '
59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp
* commit '
59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
Doc change: adjustments to the api changes description
Dirk Dougherty [Fri, 14 May 2010 20:46:42 +0000 (13:46 -0700)]
Merge "Doc change: adjustments to the api changes description" into froyo
Dirk Dougherty [Fri, 14 May 2010 20:45:17 +0000 (13:45 -0700)]
am
bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit '
bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp
* commit '
bba70cdba284c3d76cab9843e44097d664882938':
Doc change: add note about future instruction set support.
Dirk Dougherty [Fri, 14 May 2010 20:43:19 +0000 (13:43 -0700)]
Merge "Doc change: add note about future instruction set support." into froyo
Dirk Dougherty [Fri, 14 May 2010 20:40:19 +0000 (13:40 -0700)]
am
89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
Merge commit '
89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp
* commit '
89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
Doc change: documentation for library projects in sdk.
Jean-Baptiste Queru [Fri, 14 May 2010 20:39:48 +0000 (13:39 -0700)]
Merge "Only hold a weak pointer on SurfaceComposerClients"
Dirk Dougherty [Fri, 14 May 2010 20:38:20 +0000 (13:38 -0700)]
Merge "Doc change: documentation for library projects in sdk." into froyo
Scott Main [Fri, 14 May 2010 18:53:44 +0000 (11:53 -0700)]
am
b83a283a: docs: add dev guide for backup
Merge commit '
b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp
* commit '
b83a283ac178ab0a72f1d811189d79b26097835e':
docs: add dev guide for backup
Jean-Baptiste Queru [Fri, 14 May 2010 18:39:06 +0000 (11:39 -0700)]
Merge "SetLocaleByCarrier, only if its not an unknown carrier."
The Android Open Source Project [Fri, 14 May 2010 16:44:36 +0000 (09:44 -0700)]
merge from open-source master
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
The Android Open Source Project [Fri, 14 May 2010 16:11:31 +0000 (09:11 -0700)]
merge from open-source master
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
Jean-Baptiste Queru [Fri, 14 May 2010 16:06:43 +0000 (09:06 -0700)]
Merge "Accept media files by file extension in case insensitive manner."
Dirk Dougherty [Fri, 14 May 2010 04:32:21 +0000 (21:32 -0700)]
am
fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
Merge commit '
fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp
* commit '
fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
Doc change: adjustments for ndk feature description
Dirk Dougherty [Fri, 14 May 2010 04:31:10 +0000 (21:31 -0700)]
Merge "Doc change: adjustments for ndk feature description" into froyo
Dirk Dougherty [Fri, 14 May 2010 04:26:22 +0000 (21:26 -0700)]
am
a0711e7b: Doc change: Add compatibility article.
Merge commit '
a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp
* commit '
a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
Doc change: Add compatibility article.
Joe Onorato [Thu, 13 May 2010 23:33:22 +0000 (16:33 -0700)]
Merge "Put the wifi status icon in the right place."
Suchi Amalapurapu [Thu, 13 May 2010 23:04:24 +0000 (16:04 -0700)]
am
c928a11e: Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
Merge commit '
c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp
* commit '
c928a11e34678296511d5ea34582292be7368618':
Fix
2672155
Suchi Amalapurapu [Thu, 13 May 2010 23:02:20 +0000 (16:02 -0700)]
Merge "Fix
2672155 Check the code path when enabling disabling packages." into froyo
The Android Open Source Project [Thu, 13 May 2010 21:50:16 +0000 (14:50 -0700)]
merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
Mike Lockwood [Thu, 13 May 2010 21:04:30 +0000 (14:04 -0700)]
am
098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '
098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp
* commit '
098e58da93f304d7d7791f193c6237870b94989d':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Dianne Hackborn [Thu, 13 May 2010 20:25:16 +0000 (13:25 -0700)]
Merge "Corrected debug message in WindowManager"
Jean-Baptiste Queru [Thu, 13 May 2010 18:39:51 +0000 (11:39 -0700)]
Merge "New test in FrameworkTest for the VelocityTracker class"
Andreas Huber [Thu, 13 May 2010 18:16:43 +0000 (11:16 -0700)]
am
3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp
* commit '
3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Jean-Baptiste Queru [Thu, 13 May 2010 18:06:28 +0000 (11:06 -0700)]
Merge "Preserve '+' in phone numbers imported from SIM."
The Android Open Source Project [Thu, 13 May 2010 16:04:45 +0000 (09:04 -0700)]
merge from open-source master
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
Costin Manolache [Thu, 13 May 2010 02:06:39 +0000 (19:06 -0700)]
am
8ea9f130: Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Merge commit '
8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '
8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug
2680071: Rename the Cloud to Device
Costin Manolache [Thu, 13 May 2010 02:04:27 +0000 (19:04 -0700)]
Merge "Bug
2680071: Rename the Cloud to Device" into froyo
Costin Manolache [Wed, 12 May 2010 23:04:10 +0000 (16:04 -0700)]
Bug
2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
Scott Main [Wed, 12 May 2010 22:33:38 +0000 (15:33 -0700)]
am
38b523af: Merge "docs: add missing path-permissions document" into froyo
Merge commit '
38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp
* commit '
38b523af5c233dd5f8631ada2cd80b2d75b0efde':
docs: add missing path-permissions document
Scott Main [Wed, 12 May 2010 22:33:35 +0000 (15:33 -0700)]
am
f0e4ae56: Merge "docs: fix broken links" into froyo
Merge commit '
f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp
* commit '
f0e4ae563228db584041d517672aeadacecba61f':
docs: fix broken links
Grace Kloba [Wed, 12 May 2010 22:33:30 +0000 (15:33 -0700)]
am
336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
Merge commit '
336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '
336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
Scott Main [Wed, 12 May 2010 22:01:30 +0000 (15:01 -0700)]
Merge "docs: add missing path-permissions document" into froyo
The Android Open Source Project [Wed, 12 May 2010 21:54:38 +0000 (14:54 -0700)]
merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
Scott Main [Wed, 12 May 2010 21:53:35 +0000 (14:53 -0700)]
Merge "docs: fix broken links" into froyo
The Android Open Source Project [Wed, 12 May 2010 21:53:25 +0000 (14:53 -0700)]
merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e