OSDN Git Service
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
The Android Open Source Project [Wed, 12 May 2010 21:39:38 +0000 (14:39 -0700)]
merge from open-source master
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
The Android Open Source Project [Wed, 12 May 2010 21:10:23 +0000 (14:10 -0700)]
merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
The Android Open Source Project [Wed, 12 May 2010 19:33:35 +0000 (12:33 -0700)]
merge from open-source master
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
The Android Open Source Project [Wed, 12 May 2010 18:58:14 +0000 (11:58 -0700)]
merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
Dirk Dougherty [Wed, 12 May 2010 18:08:46 +0000 (11:08 -0700)]
am
a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Merge commit '
a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit '
a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
Dirk Dougherty [Wed, 12 May 2010 18:05:03 +0000 (11:05 -0700)]
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
Scott Main [Wed, 12 May 2010 14:50:59 +0000 (07:50 -0700)]
am
18dc51d4: Merge "docs: fix broken anchor names" into froyo
Merge commit '
18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp
* commit '
18dc51d4137c5cf8364541e25ad9ded203342c6b':
docs: fix broken anchor names
Dirk Dougherty [Wed, 12 May 2010 14:50:57 +0000 (07:50 -0700)]
am
0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Merge commit '
0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp
* commit '
0d1b0814be24f501395bf175fba8691117f782d5':
Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
Dirk Dougherty [Wed, 12 May 2010 14:50:53 +0000 (07:50 -0700)]
am
4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
Merge commit '
4d5275e723221df67aad00a440dd6a2e9a22caae' into froyo-plus-aosp
* commit '
4d5275e723221df67aad00a440dd6a2e9a22caae':
Doc change: update diff report 7-> 8
Scott Main [Wed, 12 May 2010 14:50:48 +0000 (07:50 -0700)]
am
827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Merge commit '
827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp
* commit '
827a50dda4c1900ab5333f8c2d3705796ff4649d':
docs: remove the dashboard from the sidenav for the offline docs
Brett Chabot [Wed, 12 May 2010 14:50:44 +0000 (07:50 -0700)]
am
b4c9a8f6: Merge "Fix imf tests." into froyo
Merge commit '
b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp
* commit '
b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
Fix imf tests.
Scott Main [Wed, 12 May 2010 14:50:41 +0000 (07:50 -0700)]
am
bb129dc5: docs: make Notifying the User an expandable list
Merge commit '
bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp
* commit '
bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
docs: make Notifying the User an expandable list
Scott Main [Wed, 12 May 2010 14:50:36 +0000 (07:50 -0700)]
am
a225e3b1: docs: add quickview box with "see also" links for some articles
Merge commit '
a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp
* commit '
a225e3b1cd02da0f748f1a8e7341c727eff28085':
docs: add quickview box with "see also" links for some articles
Scott Main [Wed, 12 May 2010 14:50:30 +0000 (07:50 -0700)]
am
6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
Merge commit '
6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp
* commit '
6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
docs: remove allowBackup attribute from documentation
Xavier Ducrohet [Wed, 12 May 2010 14:50:19 +0000 (07:50 -0700)]
am
b1235a57: Merge "Hide two audio focus methods." into froyo
Merge commit '
b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp
* commit '
b1235a57a09174179553acecef2370354bdcbf41':
Hide two audio focus methods.
Marco Nelissen [Wed, 12 May 2010 14:50:14 +0000 (07:50 -0700)]
am
836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug
2671792." into froyo
Merge commit '
836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '
836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
Dianne Hackborn [Wed, 12 May 2010 14:50:09 +0000 (07:50 -0700)]
am
037cd341: Merge "Fix issue #
2676378: Activity Manager Crash on FRF40" into froyo
Merge commit '
037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp
* commit '
037cd3413a925c6f449050096a7cd4aab3207612':
Fix issue #
2676378: Activity Manager Crash on FRF40
Scott Main [Wed, 12 May 2010 14:50:02 +0000 (07:50 -0700)]
am
5cdf5fdc: docs: add document about app install location
Merge commit '
5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp
* commit '
5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
docs: add document about app install location
Dirk Dougherty [Wed, 12 May 2010 14:49:57 +0000 (07:49 -0700)]
am
8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo
Merge commit '
8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp
* commit '
8acb68e9aae7f6766b88440ede6598da63db9fdd':
Doc Change: Docs for NDK r4.
Scott Main [Wed, 12 May 2010 14:49:51 +0000 (07:49 -0700)]
am
c80b95a8: Merge "docs: announce froyo and update IO message" into froyo
Merge commit '
c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp
* commit '
c80b95a85ae31eba80870cb3416fd2c25821c056':
docs: announce froyo and update IO message
Mike Lockwood [Wed, 12 May 2010 14:49:45 +0000 (07:49 -0700)]
am
e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit '
e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp
* commit '
e1d7dca608ced72c75bf906c7267a1ef30349826':
LocationManagerService: Call updateNetworkState on providers that are disabled.
Andreas Huber [Wed, 12 May 2010 14:49:39 +0000 (07:49 -0700)]
am
e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Merge commit '
e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit '
e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
Andreas Huber [Wed, 12 May 2010 14:49:31 +0000 (07:49 -0700)]
am
d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
Merge commit '
d6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp
* commit '
d6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Costin Manolache [Wed, 12 May 2010 14:49:16 +0000 (07:49 -0700)]
am
e2055fe4: Merge "Bug
2673557: rename datamessaging" into froyo
Merge commit '
e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp
* commit '
e2055fe4258f8085a88328579c852ec26d77bb10':
Bug
2673557: rename datamessaging
Jean-Michel Trivi [Wed, 12 May 2010 14:49:10 +0000 (07:49 -0700)]
am
3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo
Merge commit '
3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '
3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
Dirk Dougherty [Wed, 12 May 2010 14:49:00 +0000 (07:49 -0700)]
am
fe089334: Merge "Doc Change: cherry-pick from ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo
Merge commit '
fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp
* commit '
fe08933450f4be42c9b3eac900c64f23857ecd17':
Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
Jean-Michel Trivi [Wed, 12 May 2010 14:48:50 +0000 (07:48 -0700)]
am
aaa01b18: Merge " Fix bug
2670395 and
2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen
Merge commit '
aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp
* commit '
aaa01b181c0eea4ff6496d446e25e499b12ca14c':
Fix bug
2670395 and
2599698
Wu-cheng Li [Wed, 12 May 2010 14:48:41 +0000 (07:48 -0700)]
am
78624e41: Add remove method in CameraParameters class.
Merge commit '
78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp
* commit '
78624e41da166712aaa5ae47e4d3467337ac810a':
Add remove method in CameraParameters class.
Scott Main [Wed, 12 May 2010 03:13:26 +0000 (20:13 -0700)]
Merge "docs: fix broken anchor names" into froyo
Dirk Dougherty [Wed, 12 May 2010 02:53:04 +0000 (19:53 -0700)]
Merge "Doc change: update diff report 7-> 8" into froyo
Scott Main [Wed, 12 May 2010 02:25:19 +0000 (19:25 -0700)]
Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
Brett Chabot [Wed, 12 May 2010 02:17:04 +0000 (19:17 -0700)]
Merge "Fix imf tests." into froyo
Scott Main [Tue, 11 May 2010 22:25:38 +0000 (15:25 -0700)]
Merge "docs: remove allowBackup attribute from documentation" into froyo
Xavier Ducrohet [Tue, 11 May 2010 21:48:48 +0000 (14:48 -0700)]
Merge "Hide two audio focus methods." into froyo
Marco Nelissen [Tue, 11 May 2010 21:36:16 +0000 (14:36 -0700)]
Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug
2671792." into froyo
Dianne Hackborn [Tue, 11 May 2010 21:26:43 +0000 (14:26 -0700)]
Merge "Fix issue #
2676378: Activity Manager Crash on FRF40" into froyo
Dirk Dougherty [Tue, 11 May 2010 21:20:24 +0000 (14:20 -0700)]
Merge "Doc Change: Docs for NDK r4." into froyo
Scott Main [Tue, 11 May 2010 21:04:49 +0000 (14:04 -0700)]
Merge "docs: announce froyo and update IO message" into froyo
Mike Lockwood [Tue, 11 May 2010 20:26:25 +0000 (13:26 -0700)]
Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Andreas Huber [Tue, 11 May 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Andreas Huber [Tue, 11 May 2010 19:20:55 +0000 (12:20 -0700)]
Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo
Dianne Hackborn [Tue, 11 May 2010 19:07:32 +0000 (12:07 -0700)]
Merge "Corrected repeat count for key repeat in input device."
OSDN Git Service
