OSDN Git Service
Jaikumar Ganesh [Mon, 11 Jan 2010 22:23:18 +0000 (14:23 -0800)]
am
495d820c: am
ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit '
495d820c0124a811b9352b93ce4fe88c716f259d'
* commit '
495d820c0124a811b9352b93ce4fe88c716f259d':
Don't set priority in Bonding state.
Tom Taylor [Mon, 11 Jan 2010 22:23:09 +0000 (14:23 -0800)]
am
2bb1f870: am
1edd8277: Merge "Hide unused fields" into eclair
Merge commit '
2bb1f87089faa14954c1b5afa92a34ea947f5ff6'
* commit '
2bb1f87089faa14954c1b5afa92a34ea947f5ff6':
Hide unused fields
Jaikumar Ganesh [Mon, 11 Jan 2010 22:20:53 +0000 (14:20 -0800)]
am
ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit '
ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp
* commit '
ccaebfc9428aa7c167caf469f7393e1fb375307e':
Don't set priority in Bonding state.
Tom Taylor [Mon, 11 Jan 2010 22:15:51 +0000 (14:15 -0800)]
am
1edd8277: Merge "Hide unused fields" into eclair
Merge commit '
1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp
* commit '
1edd8277440c83ef44e0128e86afb8c002e49b17':
Hide unused fields
Derek Sollenberger [Mon, 11 Jan 2010 22:14:28 +0000 (14:14 -0800)]
am
1fed31aa: am
fef4874a: fixing build break by removing unused imports.
Merge commit '
1fed31aa81f769db308f6d92b0530ad52fa79ca8'
* commit '
1fed31aa81f769db308f6d92b0530ad52fa79ca8':
fixing build break by removing unused imports.
Tom Taylor [Mon, 11 Jan 2010 22:11:46 +0000 (14:11 -0800)]
Merge "Hide unused fields" into eclair
Trevor Johns [Mon, 11 Jan 2010 22:08:15 +0000 (14:08 -0800)]
am
18dedf2c: am
50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '
18dedf2cdfd2c78d93061f20c4269f00449a8e6a'
* commit '
18dedf2cdfd2c78d93061f20c4269f00449a8e6a':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Trevor Johns [Mon, 11 Jan 2010 22:05:55 +0000 (14:05 -0800)]
am
50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Merge commit '
50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp
* commit '
50a3977c619be113bb35fb7fd53874effad6dbe4':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Trevor Johns [Mon, 11 Jan 2010 22:00:54 +0000 (14:00 -0800)]
Merge "Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com." into eclair
Dirk Dougherty [Mon, 11 Jan 2010 21:50:42 +0000 (13:50 -0800)]
am
6b113b1a: am
595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair
Merge commit '
6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9'
* commit '
6b113b1a82e04e087dca3c07fa4cf3dbb6e422d9':
SDK doc change: Miscellaneous fixes.
Grace Kloba [Mon, 11 Jan 2010 21:49:49 +0000 (13:49 -0800)]
am
6c87c77d: (-s ours) am
a2b0d38f: First draft of multitouch in the WebView.
Merge commit '
6c87c77de449f6f85b822022501c2de7ecd24660'
* commit '
6c87c77de449f6f85b822022501c2de7ecd24660':
First draft of multitouch in the WebView.
Derek Sollenberger [Mon, 11 Jan 2010 21:31:43 +0000 (13:31 -0800)]
am
fef4874a: fixing build break by removing unused imports.
Merge commit '
fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp
* commit '
fef4874afddeeba8eaac6da49cc3203e9ce2d009':
fixing build break by removing unused imports.
Derek Sollenberger [Mon, 11 Jan 2010 21:23:41 +0000 (13:23 -0800)]
am
d55aa751: am
7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '
d55aa75138cb3305e1aeb6fb4873851435462f2f'
* commit '
d55aa75138cb3305e1aeb6fb4873851435462f2f':
consolidating to only use one surface per plugin. give plugin access to java context.
Derek Sollenberger [Mon, 11 Jan 2010 21:11:13 +0000 (13:11 -0800)]
am
7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '
7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp
* commit '
7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
consolidating to only use one surface per plugin. give plugin access to java context.
Jack Palevich [Mon, 11 Jan 2010 21:00:36 +0000 (13:00 -0800)]
am
90ce68a9: (-s ours) am
6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '
90ce68a99f8803643d83be963aa0f28fa952a186'
* commit '
90ce68a99f8803643d83be963aa0f28fa952a186':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
Vasu Nori [Mon, 11 Jan 2010 21:00:28 +0000 (13:00 -0800)]
am
9c74295f: am
a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit '
9c74295fb16da0469304a7c04c471915e28d09bd'
* commit '
9c74295fb16da0469304a7c04c471915e28d09bd':
add eventlog message whenever sqlite reports db corruption error
Scott Main [Mon, 11 Jan 2010 21:00:14 +0000 (13:00 -0800)]
am
c9a26f29: am
aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit '
c9a26f291b8a845fcb5e3034c259d13d3297a98d'
* commit '
c9a26f291b8a845fcb5e3034c259d13d3297a98d':
javadoc change: fix the selector sample XML in the class
Dirk Dougherty [Mon, 11 Jan 2010 19:38:04 +0000 (11:38 -0800)]
am
595f48b2: Merge "SDK doc change: Miscellaneous fixes." into eclair
Merge commit '
595f48b2a4fa2751ad638b60d2476e77738b21da' into eclair-plus-aosp
* commit '
595f48b2a4fa2751ad638b60d2476e77738b21da':
SDK doc change: Miscellaneous fixes.
Dirk Dougherty [Mon, 11 Jan 2010 19:33:57 +0000 (11:33 -0800)]
Merge "SDK doc change: Miscellaneous fixes." into eclair
Mike Lockwood [Mon, 11 Jan 2010 18:48:51 +0000 (10:48 -0800)]
Merge "Unhide LocationManager APIs needed for unbundled location providers."
Andrei Popescu [Mon, 11 Jan 2010 18:47:23 +0000 (10:47 -0800)]
Merge "Allow a video to be correctly resumed programatically after being paused."
Grace Kloba [Mon, 11 Jan 2010 18:47:21 +0000 (10:47 -0800)]
am
a2b0d38f: First draft of multitouch in the WebView.
Merge commit '
a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp
* commit '
a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
First draft of multitouch in the WebView.
San Mehat [Mon, 11 Jan 2010 18:10:10 +0000 (10:10 -0800)]
Merge "MountService: Clean up some logspam"
Bjorn Bringert [Mon, 11 Jan 2010 16:39:24 +0000 (08:39 -0800)]
Merge "Copy SearchSourceSelector from QuickSearchBox"
Leon Scroggins [Mon, 11 Jan 2010 14:58:51 +0000 (06:58 -0800)]
am
ff7d33b5: am
04e0a101: Bring up IME after receiving a response from webkit.
Merge commit '
ff7d33b55b799b234f66fdcf65070ef590fee6d9'
* commit '
ff7d33b55b799b234f66fdcf65070ef590fee6d9':
Bring up IME after receiving a response from webkit.
Leon Scroggins [Mon, 11 Jan 2010 14:42:13 +0000 (06:42 -0800)]
am
04e0a101: Bring up IME after receiving a response from webkit.
Merge commit '
04e0a1018f69b38827e63a7f19a4d1e341f9725a' into eclair-mr2-plus-aosp
* commit '
04e0a1018f69b38827e63a7f19a4d1e341f9725a':
Bring up IME after receiving a response from webkit.
Jack Palevich [Sun, 10 Jan 2010 05:54:28 +0000 (21:54 -0800)]
am
6d0f6c78: Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Merge commit '
6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp
* commit '
6d0f6c78037225ef5648d10e45a513a2e7c612b5':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
Jack Palevich [Sun, 10 Jan 2010 05:51:05 +0000 (21:51 -0800)]
Merge "DO NOT MERGE A library for encoding and decoding ETC1 textures." into eclair
Vasu Nori [Sat, 9 Jan 2010 00:33:50 +0000 (16:33 -0800)]
am
a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit '
a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd' into eclair-plus-aosp
* commit '
a1759ceac2f56f1c83ad6d1bc38e30ece2bf99fd':
add eventlog message whenever sqlite reports db corruption error
Scott Main [Sat, 9 Jan 2010 00:33:45 +0000 (16:33 -0800)]
am
aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit '
aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp
* commit '
aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
javadoc change: fix the selector sample XML in the class
Daniel Sandler [Sat, 9 Jan 2010 00:33:00 +0000 (16:33 -0800)]
am
cffea95e: (-s ours) am
3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Merge commit '
cffea95e1ef203223b87ae8a6bde415b25c5c415'
* commit '
cffea95e1ef203223b87ae8a6bde415b25c5c415':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
Eric Laurent [Sat, 9 Jan 2010 00:28:21 +0000 (16:28 -0800)]
am
d31d7397: am
663ec308: Fix issue
2361949: A2DP suspend parameters set wrongly.
Merge commit '
d31d7397ba26dcd913e96d06f0a8fd593780d629'
* commit '
d31d7397ba26dcd913e96d06f0a8fd593780d629':
Fix issue
2361949: A2DP suspend parameters set wrongly.
Romain Guy [Fri, 8 Jan 2010 23:32:18 +0000 (15:32 -0800)]
Merge "Deprecate fill_parent and introduce match_parent. Bug: #
2361749."
Charles Chen [Fri, 8 Jan 2010 23:26:57 +0000 (15:26 -0800)]
Merge "Enabling multiple apps to use different speech synthesis engines and not interfere with one another."
Jean-Michel Trivi [Fri, 8 Jan 2010 23:21:39 +0000 (15:21 -0800)]
Merge "Remove useless start of AudioTrack for TTS and improper volume setting. The AudioTrack that plays the synthesized audio data should only be started when the first synthesis request is sent, not after the initialization of the engine. The track volume should be initialized to it nominal level. Volumes above 1 do not provide amplification, so setting the volume to 2 is not necessary."
Romain Guy [Fri, 8 Jan 2010 23:06:28 +0000 (15:06 -0800)]
Deprecate fill_parent and introduce match_parent.
Bug: #
2361749.
Vasu Nori [Fri, 8 Jan 2010 23:09:12 +0000 (15:09 -0800)]
Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
San Mehat [Fri, 8 Jan 2010 23:05:57 +0000 (15:05 -0800)]
Merge "MountService: Add new Settings for UMS prompting and notification behavior"
San Mehat [Fri, 8 Jan 2010 23:03:43 +0000 (15:03 -0800)]
Merge "Settings: Add settings for MountService prefs and bump DB version to 46"
Mike Reed [Fri, 8 Jan 2010 22:36:52 +0000 (14:36 -0800)]
Merge "explicitly initialize static final boolean to fix build"
Andreas Huber [Fri, 8 Jan 2010 22:09:01 +0000 (14:09 -0800)]
Merge "Reorganize some of the stagefright implementation related to metadata."
Mike Reed [Fri, 8 Jan 2010 21:34:54 +0000 (13:34 -0800)]
Merge "optional flag to enable tracker debugging"
Tom O'Neill [Fri, 8 Jan 2010 21:04:56 +0000 (13:04 -0800)]
Merge "ContentResolver.query() includes performance considerations"
Joe Onorato [Fri, 8 Jan 2010 02:48:32 +0000 (21:48 -0500)]
less log spew
San Mehat [Fri, 8 Jan 2010 20:38:24 +0000 (12:38 -0800)]
Merge "MountService: Fix asec list bug"
Daniel Sandler [Fri, 8 Jan 2010 20:33:17 +0000 (12:33 -0800)]
am
3fb4ee4e: Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Merge commit '
3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp
* commit '
3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
Daniel Sandler [Fri, 8 Jan 2010 20:31:03 +0000 (12:31 -0800)]
Merge "Immediately close the shade when the status bar is disabled. (DO NOT MERGE)" into eclair
Eric Laurent [Fri, 8 Jan 2010 20:17:08 +0000 (12:17 -0800)]
am
663ec308: Fix issue
2361949: A2DP suspend parameters set wrongly.
Merge commit '
663ec308801a34de82db9ab993f0e906da690f89' into eclair-plus-aosp
* commit '
663ec308801a34de82db9ab993f0e906da690f89':
Fix issue
2361949: A2DP suspend parameters set wrongly.
Erik Pasternak [Fri, 8 Jan 2010 18:45:35 +0000 (10:45 -0800)]
Merge "b/
2293263 Finished removing busyBits references."
Eric Fischer [Fri, 8 Jan 2010 18:00:58 +0000 (10:00 -0800)]
Merge "Update with latest translations."
Andrei Popescu [Fri, 8 Jan 2010 17:49:31 +0000 (09:49 -0800)]
Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database."
Patrick Scott [Fri, 8 Jan 2010 17:23:44 +0000 (09:23 -0800)]
Merge "Deprecate onTooManyRedirects."
Vasu Nori [Fri, 8 Jan 2010 17:21:31 +0000 (09:21 -0800)]
Merge "when finalizing SQLiteCursor, close it but don't throw exceptions."
Doug Zongker [Fri, 8 Jan 2010 16:41:17 +0000 (08:41 -0800)]
Merge "remove Settings.Gservices"
San Mehat [Fri, 8 Jan 2010 15:19:56 +0000 (07:19 -0800)]
Merge "Environment: Catch *all* exceptions from MountService"
Leon Scroggins [Fri, 8 Jan 2010 14:48:21 +0000 (06:48 -0800)]
am
4e9a9d8e: am
c89b13b9: Use Calendar.add() instead of Calendar.roll()
Merge commit '
4e9a9d8ea8a31578b936b17f66177f4c1b18cddb'
* commit '
4e9a9d8ea8a31578b936b17f66177f4c1b18cddb':
Use Calendar.add() instead of Calendar.roll()
Cary Clark [Fri, 8 Jan 2010 14:48:08 +0000 (06:48 -0800)]
am
2110bb02: am
affa5d2c: remove unused jni interfaces
Merge commit '
2110bb024eafe4578bb9acace9f1ad4ae55ff9fd'
* commit '
2110bb024eafe4578bb9acace9f1ad4ae55ff9fd':
remove unused jni interfaces
Leon Scroggins [Fri, 8 Jan 2010 14:43:36 +0000 (06:43 -0800)]
am
c89b13b9: Use Calendar.add() instead of Calendar.roll()
Merge commit '
c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp
* commit '
c89b13b962c6634db536e563a42d058702ce045b':
Use Calendar.add() instead of Calendar.roll()
Jack Palevich [Fri, 8 Jan 2010 08:00:21 +0000 (16:00 +0800)]
DO NOT MERGE A library for encoding and decoding ETC1 textures.
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
This change adds a host-only version of the library. It is used by
the etc1tool.
Dan Egnor [Fri, 8 Jan 2010 03:16:34 +0000 (19:16 -0800)]
Merge "Bumper un-@hide (un-@pending actually) of previously reviewed APIs:"
Trevor Johns [Fri, 8 Jan 2010 03:02:03 +0000 (19:02 -0800)]
am
f6de904a: am
063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit '
f6de904a3c62895c691ce82dbf84e2abf0bdd019'
* commit '
f6de904a3c62895c691ce82dbf84e2abf0bdd019':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Trevor Johns [Fri, 8 Jan 2010 02:58:35 +0000 (18:58 -0800)]
am
063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit '
063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp
* commit '
063d03ed0882582840c7db610635aa89c1a01eec':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Doug Zongker [Fri, 8 Jan 2010 02:14:05 +0000 (18:14 -0800)]
Merge "remove GoogleWebContentHelper class"
Doug Zongker [Thu, 7 Jan 2010 21:51:16 +0000 (13:51 -0800)]
change remaining frameworks/base Gservices to Secure settings
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
Erik Pasternak [Thu, 7 Jan 2010 21:52:08 +0000 (13:52 -0800)]
Merge "b/
2358627 and b/
2293263 Fixed eventDay bugs."
Dirk Dougherty [Thu, 7 Jan 2010 20:37:15 +0000 (12:37 -0800)]
am
5f6002ec: am
d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
Merge commit '
5f6002ec5f52ed164b591cf4b267fe771a81731f'
* commit '
5f6002ec5f52ed164b591cf4b267fe771a81731f':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Dirk Dougherty [Thu, 7 Jan 2010 20:33:48 +0000 (12:33 -0800)]
am
d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
Merge commit '
d71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp
* commit '
d71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Dirk Dougherty [Thu, 7 Jan 2010 20:30:14 +0000 (12:30 -0800)]
Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
San Mehat [Thu, 7 Jan 2010 19:35:29 +0000 (11:35 -0800)]
Merge "PowerManagerService: Switch to using MountService shutdown for media"
San Mehat [Thu, 7 Jan 2010 19:35:23 +0000 (11:35 -0800)]
Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown"
Scott Main [Thu, 7 Jan 2010 18:26:49 +0000 (10:26 -0800)]
am
707ca41d: am
d8858893: Merge "docs: fix some broken links" into eclair
Merge commit '
707ca41d1f93e54aa0abcf3455522ba8d4c8affb'
* commit '
707ca41d1f93e54aa0abcf3455522ba8d4c8affb':
docs: fix some broken links
Scott Main [Thu, 7 Jan 2010 18:21:52 +0000 (10:21 -0800)]
am
d8858893: Merge "docs: fix some broken links" into eclair
Merge commit '
d88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp
* commit '
d88588935e3a09b4b13753d55dbe8a8e9ed240a1':
docs: fix some broken links
Cary Clark [Thu, 7 Jan 2010 18:19:56 +0000 (10:19 -0800)]
am
affa5d2c: remove unused jni interfaces
Merge commit '
affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp
* commit '
affa5d2c0f7c2ade43ded5ff9a7952b269183117':
remove unused jni interfaces
Scott Main [Thu, 7 Jan 2010 18:18:45 +0000 (10:18 -0800)]
Merge "docs: fix some broken links" into eclair
Dan Egnor [Thu, 7 Jan 2010 17:42:57 +0000 (09:42 -0800)]
Merge "Remove old EventLog tests from here, they will be replaced by a (better) EventLog test in CTS."
Doug Zongker [Thu, 7 Jan 2010 17:24:01 +0000 (09:24 -0800)]
Merge "move Watchdog's settings from Gservices to Secure"
Xavier Ducrohet [Thu, 7 Jan 2010 17:22:16 +0000 (09:22 -0800)]
am
de0ef181: am
ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
Merge commit '
de0ef181516ce13d292eafb741fa6c6b9dc1cb1c'
* commit '
de0ef181516ce13d292eafb741fa6c6b9dc1cb1c':
Move Layoutlib API library to sdk.git
Jaikumar Ganesh [Thu, 7 Jan 2010 17:22:04 +0000 (09:22 -0800)]
am
2790b20c: am
0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
Merge commit '
2790b20c537b33dbf366436f6d27776148ded490'
* commit '
2790b20c537b33dbf366436f6d27776148ded490':
Fix media option settings for A2DP.
Dianne Hackborn [Thu, 7 Jan 2010 17:21:52 +0000 (09:21 -0800)]
am
ce56857e: am
cb2d50d0: Fix issue #
2357259: aapt tool prints "uses-configuation:"
Merge commit '
ce56857ef72538c197afd91b9f30dc868d2667d9'
* commit '
ce56857ef72538c197afd91b9f30dc868d2667d9':
Fix issue #
2357259: aapt tool prints "uses-configuation:"
Ying Wang [Thu, 7 Jan 2010 17:21:40 +0000 (09:21 -0800)]
Tom O'Neill [Thu, 7 Jan 2010 17:18:55 +0000 (09:18 -0800)]
Merge "Update Notepad tutorial documentation to match code"
Xavier Ducrohet [Thu, 7 Jan 2010 17:16:32 +0000 (09:16 -0800)]
am
ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
Merge commit '
ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp
* commit '
ce60d4b27e17d98423fd339f61e8b746866f1f4e':
Move Layoutlib API library to sdk.git
Xavier Ducrohet [Thu, 7 Jan 2010 17:08:06 +0000 (09:08 -0800)]
Merge "Move Layoutlib API library to sdk.git" into eclair
Leon Scroggins [Thu, 7 Jan 2010 14:00:17 +0000 (06:00 -0800)]
am
bd6029fc: am
3a503399: Request <label> info only when accessing a textfield.
Merge commit '
bd6029fc5171e1094a00cdecb3f33aae6fe69c9f'
* commit '
bd6029fc5171e1094a00cdecb3f33aae6fe69c9f':
Request <label> info only when accessing a textfield.
Leon Scroggins [Thu, 7 Jan 2010 13:46:19 +0000 (05:46 -0800)]
am
3a503399: Request <label> info only when accessing a textfield.
Merge commit '
3a5033996e9df21abbd5b296d817c2acaedcb0f9' into eclair-mr2-plus-aosp
* commit '
3a5033996e9df21abbd5b296d817c2acaedcb0f9':
Request <label> info only when accessing a textfield.
Bjorn Bringert [Thu, 7 Jan 2010 10:21:58 +0000 (02:21 -0800)]
Merge "Get correct density info when using resource URIs in ImageView"
Mike Lockwood [Thu, 7 Jan 2010 04:17:10 +0000 (20:17 -0800)]
Merge "Fix broken Javadoc link."
Mike Lockwood [Thu, 7 Jan 2010 03:43:42 +0000 (19:43 -0800)]
Merge "Add LocationManagerImpl class to act as a public wrapper for the ILocationProvider interface"
Romain Guy [Thu, 7 Jan 2010 02:50:53 +0000 (18:50 -0800)]
Merge "Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. Bug: #
2359368."
James Dong [Thu, 7 Jan 2010 01:26:01 +0000 (17:26 -0800)]
Merge "Add MPEG to the file extensions that scanner cares"
Jason Sams [Thu, 7 Jan 2010 01:25:32 +0000 (17:25 -0800)]
Merge "Support npot on es 2.0 HW."
Oscar Montemayor [Thu, 7 Jan 2010 01:09:33 +0000 (17:09 -0800)]
Merge "Apps on SD card project. A simple keystore to store system-only key material, by leveraging file system access permissions."
San Mehat [Thu, 7 Jan 2010 00:45:52 +0000 (16:45 -0800)]
Merge "PowerManagerService: When rebooting, ensure external storage is unmounted"
Doug Zongker [Thu, 7 Jan 2010 00:02:46 +0000 (16:02 -0800)]
Merge "add ACCESS_CACHE_FILESYSTEM permission to core manifest"
San Mehat [Wed, 6 Jan 2010 22:30:56 +0000 (14:30 -0800)]
Merge "framework: MountService: Add initial support for Android Secure External Caches"
Dan Egnor [Wed, 6 Jan 2010 22:15:53 +0000 (14:15 -0800)]
Merge "Fix SDK build problem until EventLog is published."
Joe Onorato [Wed, 6 Jan 2010 22:10:33 +0000 (14:10 -0800)]
Merge "Stop spamming the log."
Cary Clark [Wed, 6 Jan 2010 22:05:58 +0000 (14:05 -0800)]
am
9e5f3ec9: am
e3bbaf6c: Merge "set nine patch padding initially to an empty rectangle" into eclair-mr2
Merge commit '
9e5f3ec97d468702aa3f3a59e94009e807715189'
* commit '
9e5f3ec97d468702aa3f3a59e94009e807715189':
set nine patch padding initially to an empty rectangle
Leon Scroggins [Wed, 6 Jan 2010 22:05:46 +0000 (14:05 -0800)]
am
fbd3afb1: am
e38fc189: Show label information as hint text
Merge commit '
fbd3afb1801ed69a5c948241e68b997be3d84f4e'
* commit '
fbd3afb1801ed69a5c948241e68b997be3d84f4e':
Show label information as hint text
Jaikumar Ganesh [Wed, 6 Jan 2010 21:46:59 +0000 (13:46 -0800)]
am
0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
Merge commit '
0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp
* commit '
0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
Fix media option settings for A2DP.