OSDN Git Service
The Android Open Source Project [Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
The Android Open Source Project [Mon, 14 Jun 2010 17:57:53 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
Jean-Baptiste Queru [Mon, 14 Jun 2010 15:56:49 +0000 (08:56 -0700)]
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
Dirk Dougherty [Fri, 11 Jun 2010 23:57:45 +0000 (16:57 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Irfan Sheriff [Fri, 11 Jun 2010 22:11:54 +0000 (15:11 -0700)]
merge from open-source master
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
The Android Open Source Project [Fri, 11 Jun 2010 20:08:02 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
Jean-Baptiste Queru [Fri, 11 Jun 2010 18:12:15 +0000 (11:12 -0700)]
Merge "WLAN: Reset power save mode to startup value after DHCP response."
Irfan Sheriff [Fri, 11 Jun 2010 02:02:13 +0000 (19:02 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Mike Lockwood [Thu, 10 Jun 2010 22:30:33 +0000 (15:30 -0700)]
am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp
* commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Adam Powell [Thu, 10 Jun 2010 21:14:44 +0000 (14:14 -0700)]
am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '
8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp
* commit '
8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down.
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Nick Kralevich [Thu, 10 Jun 2010 18:50:51 +0000 (11:50 -0700)]
Kenny Root [Thu, 10 Jun 2010 05:32:01 +0000 (22:32 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
The Android Open Source Project [Wed, 9 Jun 2010 19:17:03 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
The Android Open Source Project [Wed, 9 Jun 2010 19:14:58 +0000 (12:14 -0700)]
merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
Jean-Baptiste Queru [Wed, 9 Jun 2010 17:51:16 +0000 (10:51 -0700)]
Merge "Adding mimetypes to the mimetype map used in the web view"
The Android Open Source Project [Wed, 9 Jun 2010 16:21:39 +0000 (09:21 -0700)]
ignore from open-source master
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
Jean-Baptiste Queru [Wed, 9 Jun 2010 14:28:50 +0000 (07:28 -0700)]
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
The Android Open Source Project [Wed, 9 Jun 2010 14:14:36 +0000 (07:14 -0700)]
merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
Jim Miller [Tue, 8 Jun 2010 23:33:22 +0000 (16:33 -0700)]
am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp
* commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix
2737842: Disable KeguardManager API if device policy is enabled
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Jean-Baptiste Queru [Tue, 8 Jun 2010 22:43:02 +0000 (15:43 -0700)]
Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
The Android Open Source Project [Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)]
merge from open-source master
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
Romain Guy [Tue, 8 Jun 2010 20:01:05 +0000 (13:01 -0700)]
am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp
* commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:19:51 +0000 (10:19 -0700)]
Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https."
Jim Miller [Tue, 8 Jun 2010 04:23:33 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 02:26:28 +0000 (19:26 -0700)]
am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp
* commit '
bde25c207731783a62e3611586fe05cd35add0d9':
Fix
2737842: disable keyguard API when device policy is enabled.
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:49:07 +0000 (18:49 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 01:32:41 +0000 (18:32 -0700)]
am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Merge commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp
* commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #
2749322: addPackageToPreferred throws SecurityException
Dianne Hackborn [Tue, 8 Jun 2010 00:32:02 +0000 (17:32 -0700)]
Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Robert Greenwalt [Mon, 7 Jun 2010 23:59:23 +0000 (16:59 -0700)]
am
5a671d03: Cut logging, boost efficiency of ThrottleService
Merge commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp
* commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed':
Cut logging, boost efficiency of ThrottleService
The Android Open Source Project [Mon, 7 Jun 2010 23:37:22 +0000 (16:37 -0700)]
merge from open-source master
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
The Android Open Source Project [Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)]
merge from open-source master
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
Jean-Baptiste Queru [Mon, 7 Jun 2010 21:51:42 +0000 (14:51 -0700)]
Merge "Canvas.drawVertices: correct color range-check"
Christopher Tate [Sat, 5 Jun 2010 01:07:07 +0000 (18:07 -0700)]
am
df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Merge commit '
df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp
* commit '
df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
Christopher Tate [Sat, 5 Jun 2010 01:06:07 +0000 (18:06 -0700)]
Merge "Watchdog now records kernel stacks when it fires" into froyo
Dianne Hackborn [Fri, 4 Jun 2010 23:33:48 +0000 (16:33 -0700)]
Dianne Hackborn [Fri, 4 Jun 2010 23:32:01 +0000 (16:32 -0700)]
Merge "xhdpi" into froyo
Robert Greenwalt [Fri, 4 Jun 2010 22:57:21 +0000 (15:57 -0700)]
am
f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit '
f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp
* commit '
f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Robert Greenwalt [Fri, 4 Jun 2010 22:55:09 +0000 (15:55 -0700)]
Merge "Make the DUN apn data secure." into froyo
Jeff Hamilton [Fri, 4 Jun 2010 20:50:31 +0000 (13:50 -0700)]
am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp
* commit '
4b3309211ed6f3532b44481945a4725143d50b8a':
Don't crash when low storage is encountered pre-boot completion.
The Android Open Source Project [Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
Andreas Huber [Thu, 3 Jun 2010 22:30:03 +0000 (15:30 -0700)]
am
2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
Andreas Huber [Thu, 3 Jun 2010 22:28:13 +0000 (15:28 -0700)]
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"
Dirk Dougherty [Thu, 3 Jun 2010 19:58:35 +0000 (12:58 -0700)]
am
85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo
James Dong [Thu, 3 Jun 2010 18:27:19 +0000 (11:27 -0700)]
am
28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '
28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '
28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
James Dong [Thu, 3 Jun 2010 18:26:09 +0000 (11:26 -0700)]
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
The Android Open Source Project [Thu, 3 Jun 2010 16:03:58 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
Scott Main [Wed, 2 Jun 2010 20:44:44 +0000 (13:44 -0700)]
am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '
6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes
Scott Main [Wed, 2 Jun 2010 20:43:18 +0000 (13:43 -0700)]
Merge "docs: a couple doc bug fixes" into froyo
The Android Open Source Project [Wed, 2 Jun 2010 15:54:47 +0000 (08:54 -0700)]
merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
The Android Open Source Project [Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)]
merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
Kenny Root [Wed, 2 Jun 2010 05:56:39 +0000 (22:56 -0700)]
Merge "Improved error-handling in Rfc822Tokenizer"
Dirk Dougherty [Tue, 1 Jun 2010 22:45:24 +0000 (15:45 -0700)]
am
de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '
de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit '
de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
Dirk Dougherty [Tue, 1 Jun 2010 22:44:02 +0000 (15:44 -0700)]
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Dan Egnor [Tue, 1 Jun 2010 21:28:46 +0000 (14:28 -0700)]
am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit '
a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:07:56 +0000 (11:07 -0700)]
am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo
Christopher Tate [Fri, 28 May 2010 19:50:05 +0000 (12:50 -0700)]
am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
Kenny Root [Thu, 27 May 2010 19:35:25 +0000 (12:35 -0700)]
am
94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo
Merge commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp
* commit '
94f1751cb0c6ea4004ff86b3af89e06e00a66641':
Fix typo in EastAsianWidth javadoc
Dirk Dougherty [Thu, 27 May 2010 19:35:18 +0000 (12:35 -0700)]
am
9f95c64e: Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Merge commit '
9f95c64e66df7481b1c624c6cf29569ca384a822' into froyo-plus-aosp
* commit '
9f95c64e66df7481b1c624c6cf29569ca384a822':
Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables.
Kenny Root [Thu, 27 May 2010 19:04:34 +0000 (12:04 -0700)]
Merge "Fix typo in EastAsianWidth javadoc" into froyo
Dirk Dougherty [Thu, 27 May 2010 18:46:26 +0000 (11:46 -0700)]
Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove latest_samples.zip from shareables." into froyo
Jeff Hamilton [Thu, 27 May 2010 16:40:23 +0000 (09:40 -0700)]
am
dc46f6f6: Merge "Don\'t enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Merge commit '
dc46f6f6cc44954c23229019270b54b8912be825' into froyo-plus-aosp
* commit '
dc46f6f6cc44954c23229019270b54b8912be825':
Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.
Jeff Hamilton [Thu, 27 May 2010 16:39:19 +0000 (09:39 -0700)]
Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." into froyo
Irfan Sheriff [Thu, 27 May 2010 04:34:52 +0000 (21:34 -0700)]
am
b3f3caef: Merge "Fix null pointer exception" into froyo
Merge commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a' into froyo-plus-aosp
* commit '
b3f3caef38326be2b4aea309237f718e6e2d2b8a':
Fix null pointer exception
Irfan Sheriff [Thu, 27 May 2010 04:32:29 +0000 (21:32 -0700)]
Merge "Fix null pointer exception" into froyo
Dirk Dougherty [Thu, 27 May 2010 01:33:05 +0000 (18:33 -0700)]
am
4273ce19: Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Merge commit '
4273ce19bf898ee41f2342209af6fe8ef4fb128e' into froyo-plus-aosp
* commit '
4273ce19bf898ee41f2342209af6fe8ef4fb128e':
Doc change: Suggest min keysize of 2048 for keys.
Dirk Dougherty [Thu, 27 May 2010 01:31:38 +0000 (18:31 -0700)]
Merge "Doc change: Suggest min keysize of 2048 for keys." into froyo
Dirk Dougherty [Wed, 26 May 2010 23:51:12 +0000 (16:51 -0700)]
am
fa499e46: Merge "Doc change: fix adt download page, misc doc fixes." into froyo
Merge commit '
fa499e46203dba2db2bb40f71e5af1650315c67c' into froyo-plus-aosp
* commit '
fa499e46203dba2db2bb40f71e5af1650315c67c':
Doc change: fix adt download page, misc doc fixes.
Dirk Dougherty [Wed, 26 May 2010 23:49:46 +0000 (16:49 -0700)]
Merge "Doc change: fix adt download page, misc doc fixes." into froyo
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