OSDN Git Service
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:32:08 +0000 (13:32 -0800)]
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:28:51 +0000 (13:28 -0800)]
am
4b8ad9ef: Merge from gingerbread
* commit '
4b8ad9effd95508e9966b8a3a355f0a948558ae2':
Fix delivery report error with PENDING status in SMS
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:17:49 +0000 (13:17 -0800)]
Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
Jean-Baptiste Queru [Thu, 3 Feb 2011 21:03:36 +0000 (13:03 -0800)]
Merge
ee4c17ee from gingerbread
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:41:49 +0000 (12:41 -0800)]
Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
Jean-Baptiste Queru [Thu, 3 Feb 2011 20:17:47 +0000 (12:17 -0800)]
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
Scott Main [Thu, 3 Feb 2011 02:08:51 +0000 (18:08 -0800)]
am
ca69a634: fix broken links, update the dev guide intro, and update sitemap file
* commit '
ca69a6340610bfd7e830ff9be64a74085aea037c':
fix broken links, update the dev guide intro, and update sitemap file
Scott Main [Thu, 3 Feb 2011 00:44:55 +0000 (16:44 -0800)]
am
94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '
94a6c689acb03ba01546a10933699bde22bb4a4c':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
Scott Main [Thu, 3 Feb 2011 00:41:29 +0000 (16:41 -0800)]
am
4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
* commit '
4add7f3ffcebe1564d1e492194817afaf107ac16':
cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
Scott Main [Thu, 3 Feb 2011 00:38:25 +0000 (16:38 -0800)]
Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
Bill Gruber [Wed, 2 Feb 2011 23:46:52 +0000 (15:46 -0800)]
am
df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
* commit '
df71cabbc2f670a4acea91e04f54990a472a56e9':
cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
Scott Main [Wed, 2 Feb 2011 23:44:29 +0000 (15:44 -0800)]
am
2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
* commit '
2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
Scott Main [Wed, 2 Feb 2011 23:16:13 +0000 (15:16 -0800)]
am
0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
* commit '
0c1a4d3b51337784583ef39378ca8796bb8b0992':
cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
Irfan Sheriff [Wed, 2 Feb 2011 22:23:10 +0000 (14:23 -0800)]
resolved conflicts for merge of
0a4b3fd9 to gingerbread-plus-aosp
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:56:30 +0000 (09:56 -0800)]
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:52:24 +0000 (09:52 -0800)]
am
8226140c: Merge from gingerbread
* commit '
8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
fix for supporting 3 digits MNC code
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:48:52 +0000 (09:48 -0800)]
am
155b0ee0: Merge from open-source gingerbread
* commit '
155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:47:36 +0000 (09:47 -0800)]
Merge from gingerbread
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:45:19 +0000 (09:45 -0800)]
Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
Jean-Baptiste Queru [Wed, 2 Feb 2011 17:44:16 +0000 (09:44 -0800)]
Merge "fix for supporting 3 digits MNC code" into gingerbread
Eric Laurent [Wed, 2 Feb 2011 16:28:25 +0000 (08:28 -0800)]
am
3d4069a2: Allow TTY mode for GSM Phones
* commit '
3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones
Jean-Baptiste Queru [Tue, 1 Feb 2011 21:12:04 +0000 (13:12 -0800)]
am
dbf09fee: am
eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '
dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
Don't crash zygote if webcore fails to load
Jean-Baptiste Queru [Tue, 1 Feb 2011 21:02:19 +0000 (13:02 -0800)]
am
eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load"
* commit '
eb17d6f51a9776f02be84859b8980a6317abd27c':
Don't crash zygote if webcore fails to load
Jean-Baptiste Queru [Tue, 1 Feb 2011 20:41:55 +0000 (12:41 -0800)]
Merge "Don't crash zygote if webcore fails to load"
Nick Pelly [Tue, 1 Feb 2011 18:10:42 +0000 (10:10 -0800)]
am
cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread
* commit '
cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
Final final final Gingerbread MR API changes.
Nick Pelly [Tue, 1 Feb 2011 17:39:31 +0000 (09:39 -0800)]
Merge "Final final final Gingerbread MR API changes." into gingerbread
Dianne Hackborn [Tue, 1 Feb 2011 01:55:11 +0000 (17:55 -0800)]
am
7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
* commit '
7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
Do not check features in PackageManagerService DO NOT MERGE
Dianne Hackborn [Tue, 1 Feb 2011 01:41:54 +0000 (17:41 -0800)]
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
Eric Fischer [Tue, 1 Feb 2011 00:18:27 +0000 (16:18 -0800)]
am
a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
a019d15b667a72d7cb29afc7f153d5c517abcb76':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 1 Feb 2011 00:08:52 +0000 (16:08 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dianne Hackborn [Mon, 31 Jan 2011 22:36:02 +0000 (14:36 -0800)]
am
e6c6b760: DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
* commit '
e6c6b760eb0c1068fdfa656007ec27e482313b58':
DO NOT MERGE Fix issue #
3408542: "resizeable" attribute required to get out of compat mode
Jean-Baptiste Queru [Mon, 31 Jan 2011 20:03:59 +0000 (12:03 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:55:40 +0000 (11:55 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 19:32:33 +0000 (11:32 -0800)]
Merge "stubs"
Jeff Hamilton [Mon, 31 Jan 2011 18:05:13 +0000 (10:05 -0800)]
am
113834c5: Commit the final API for level 10.
* commit '
113834c5ab30bfc554202d0f3144a662d77f2484':
Commit the final API for level 10.
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:26:18 +0000 (16:26 -0800)]
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:19:59 +0000 (16:19 -0800)]
am
e88fa50b: Merge from open-source gingerbread
* commit '
e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
fix failing thread object run
Jean-Baptiste Queru [Mon, 31 Jan 2011 00:07:25 +0000 (16:07 -0800)]
am
25503f1c: Merge from gingerbread
* commit '
25503f1c9f0b5f718052b71dc5b21d1c8576d015':
fix failing thread object run
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:35:06 +0000 (15:35 -0800)]
Merge from gingerbread
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:29:52 +0000 (15:29 -0800)]
Merge from open-source gingerbread
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
Jean-Baptiste Queru [Sun, 30 Jan 2011 23:17:33 +0000 (15:17 -0800)]
Merge "fix failing thread object run" into gingerbread
Dianne Hackborn [Sun, 30 Jan 2011 07:04:50 +0000 (23:04 -0800)]
am
a30063d8: am
25eb0464: Merge "Normalize output from aapt d"
* commit '
a30063d80c08434ac3c7316f338c6d54110449ab':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 07:01:20 +0000 (23:01 -0800)]
am
25eb0464: Merge "Normalize output from aapt d"
* commit '
25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
Normalize output from aapt d
Dianne Hackborn [Sun, 30 Jan 2011 06:53:20 +0000 (22:53 -0800)]
Merge "Normalize output from aapt d"
Dianne Hackborn [Sun, 30 Jan 2011 06:30:57 +0000 (22:30 -0800)]
am
c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
* commit '
c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
DO NOT MERGE: Fix screen size compatibility mode.
Dianne Hackborn [Sun, 30 Jan 2011 06:20:05 +0000 (22:20 -0800)]
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
Dianne Hackborn [Sat, 29 Jan 2011 23:05:30 +0000 (15:05 -0800)]
am
2107757d: am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
2107757dde0b3159119edcc9084fcb9a87985e88':
Make AaptGroupEntry::getMncName accept mnc00
Dianne Hackborn [Sat, 29 Jan 2011 22:59:02 +0000 (14:59 -0800)]
am
bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00"
* commit '
bbb5a5ce1922a168335811b177cd7341350c15cc':
Make AaptGroupEntry::getMncName accept mnc00
Jean-Baptiste Queru [Sat, 29 Jan 2011 22:43:33 +0000 (14:43 -0800)]
am
1358b6a4: Tweak to make merges easier
* commit '
1358b6a4fb68e81058aa938e46b125350bdf0fff':
Tweak to make merges easier
Dianne Hackborn [Sat, 29 Jan 2011 22:38:48 +0000 (14:38 -0800)]
Merge "Make AaptGroupEntry::getMncName accept mnc00"
Jean-Baptiste Queru [Sat, 29 Jan 2011 16:00:52 +0000 (08:00 -0800)]
am
87d19759: Delete browerplugin tests - do not merge
* commit '
87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:58:36 +0000 (07:58 -0800)]
am
d4c8cec0: am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
d4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:39:47 +0000 (07:39 -0800)]
am
9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
* commit '
9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
Robert Greenwalt [Sat, 29 Jan 2011 14:55:38 +0000 (06:55 -0800)]
am
6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '
6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
Robert Greenwalt [Sat, 29 Jan 2011 14:38:35 +0000 (06:38 -0800)]
Merge "Add some network types that OEM's are asking for." into gingerbread
Jean-Baptiste Queru [Sat, 29 Jan 2011 14:19:37 +0000 (06:19 -0800)]
stubs
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
Jean-Baptiste Queru [Fri, 28 Jan 2011 23:26:59 +0000 (15:26 -0800)]
Merge "Delete browerplugin tests - do not merge"
Eric Fischer [Fri, 28 Jan 2011 22:19:36 +0000 (14:19 -0800)]
am
5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5f2def8cfdad2491a646be69347444a3be6ddf84':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 22:10:43 +0000 (14:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dirk Dougherty [Fri, 28 Jan 2011 20:00:51 +0000 (12:00 -0800)]
am
fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
* commit '
fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
Doc change: Add time-lapse video to 3.0 highlights.
Dirk Dougherty [Fri, 28 Jan 2011 19:57:42 +0000 (11:57 -0800)]
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
Andreas Huber [Fri, 28 Jan 2011 18:42:10 +0000 (10:42 -0800)]
am
b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '
b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
Eric Laurent [Fri, 28 Jan 2011 02:40:42 +0000 (18:40 -0800)]
am
0ef57993: Merge "Fix issue
2988031." into gingerbread
* commit '
0ef579939e6c96fcd2b42b164c5debf535a6a53b':
Fix issue
2988031.
Eric Laurent [Fri, 28 Jan 2011 02:37:04 +0000 (18:37 -0800)]
Merge "Fix issue
2988031." into gingerbread
Jim Miller [Fri, 28 Jan 2011 02:25:12 +0000 (18:25 -0800)]
am
226e5756: Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
* commit '
226e57563c3110aa688fc41f10b7a96cd21b6231':
Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
Jim Miller [Fri, 28 Jan 2011 02:22:14 +0000 (18:22 -0800)]
Merge "Fix
3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
Nick Pelly [Fri, 28 Jan 2011 00:26:28 +0000 (16:26 -0800)]
am
d350dc04: Merge "API: Make close() throw an IOException." into gingerbread
* commit '
d350dc0492fab3614749955f5dcf21ec1c522b24':
API: Make close() throw an IOException.
Nick Pelly [Fri, 28 Jan 2011 00:23:35 +0000 (16:23 -0800)]
Merge "API: Make close() throw an IOException." into gingerbread
Eric Fischer [Thu, 27 Jan 2011 23:00:43 +0000 (15:00 -0800)]
am
3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:56:29 +0000 (14:56 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 22:12:49 +0000 (14:12 -0800)]
am
21d0a173: Fix build - javadoc.
* commit '
21d0a173f138563e2eaba286b0eb505f987918a9':
Fix build - javadoc.
Scott Main [Thu, 27 Jan 2011 21:29:13 +0000 (13:29 -0800)]
am
7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
* commit '
7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
Nick Pelly [Thu, 27 Jan 2011 21:25:52 +0000 (13:25 -0800)]
am
eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread
* commit '
eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
Clean up MifareUltralight API.
Scott Main [Thu, 27 Jan 2011 21:25:10 +0000 (13:25 -0800)]
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
Nick Pelly [Thu, 27 Jan 2011 20:23:53 +0000 (12:23 -0800)]
Merge "Clean up MifareUltralight API." into gingerbread
Robert Greenwalt [Thu, 27 Jan 2011 18:20:33 +0000 (10:20 -0800)]
am
89a54408: Merge "Update networktype before sending state change." into gingerbread
* commit '
89a544088fcfa849be0d8824a2ac0a545950847b':
Update networktype before sending state change.
Robert Greenwalt [Thu, 27 Jan 2011 18:17:33 +0000 (10:17 -0800)]
Merge "Update networktype before sending state change." into gingerbread
Dirk Dougherty [Thu, 27 Jan 2011 18:08:09 +0000 (10:08 -0800)]
am
591a5f86: Doc change: fix adt archive filename.
* commit '
591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
Scott Main [Thu, 27 Jan 2011 02:37:22 +0000 (18:37 -0800)]
am
ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs
* commit '
ba3dd32357b47ab0b55a1976bbafc225df78a59d':
enable preview mode for docs and add api level 10 flag for api level diffs
Scott Main [Thu, 27 Jan 2011 01:56:26 +0000 (17:56 -0800)]
am
a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
* commit '
a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
catchup the gingerbread branch to gingerbread-docs for all sdk docs
Scott Main [Thu, 27 Jan 2011 01:52:08 +0000 (17:52 -0800)]
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
Andreas Huber [Thu, 27 Jan 2011 00:40:04 +0000 (16:40 -0800)]
am
2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '
2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Jeff Brown [Wed, 26 Jan 2011 23:03:32 +0000 (15:03 -0800)]
am
7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."
* commit '
7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
Move keymaps from sdk/emulator/keymaps.
Jeff Brown [Wed, 26 Jan 2011 22:25:08 +0000 (14:25 -0800)]
Merge "Move keymaps from sdk/emulator/keymaps."
Dianne Hackborn [Wed, 26 Jan 2011 22:08:30 +0000 (14:08 -0800)]
am
1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
* commit '
1d07b5bc9b0a9e3de4495834242548a600cae1d8':
Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:18 +0000 (14:05 -0800)]
am
2ba92c71: do not merge bug
3370834 Cherrypick from master
* commit '
2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug
3370834 Cherrypick from master
Dianne Hackborn [Wed, 26 Jan 2011 21:59:42 +0000 (13:59 -0800)]
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
Kenny Root [Wed, 26 Jan 2011 17:25:43 +0000 (09:25 -0800)]
am
138757db: Merge "Make OBB results a one-way call" into gingerbread
* commit '
138757db4f19cb626ef5c1d371d4fca004304a08':
Make OBB results a one-way call
Kenny Root [Wed, 26 Jan 2011 17:17:28 +0000 (09:17 -0800)]
Merge "Make OBB results a one-way call" into gingerbread
Ritu Srivastava [Wed, 26 Jan 2011 00:23:08 +0000 (16:23 -0800)]
fix failing thread object run
A previously exited Thread object refuses to run again, if the
thread-id of the caller, conincides with the thread-id it previously
used in the worker thread. Hence reset the previously used worker
thread-id to -1 when it exits.
Signed-off-by: Ritu Srivastava <rsrivast@sta.samsung.com>
Change-Id: I873925c312a43ec8a16392b98cc959042ff6bfd2
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
Jeff Hamilton [Wed, 26 Jan 2011 00:15:58 +0000 (16:15 -0800)]
am
c33acae9: Merge "Fix the build, proper current.xml." into gingerbread
* commit '
c33acae9060162c5d2c28613b71c3bb1e0ef4c1c':
Fix the build, proper current.xml.
Jeff Hamilton [Wed, 26 Jan 2011 00:11:37 +0000 (16:11 -0800)]
Merge "Fix the build, proper current.xml." into gingerbread
Brad Fitzpatrick [Tue, 25 Jan 2011 23:44:33 +0000 (15:44 -0800)]
am
a206efcf: Merge "android.os.Message: respect sPoolSize"
* commit '
a206efcf8d2e56cbd0d1de125b29b45fc6cc8431':
android.os.Message: respect sPoolSize
Brad Fitzpatrick [Tue, 25 Jan 2011 23:12:18 +0000 (15:12 -0800)]
Merge "android.os.Message: respect sPoolSize"
Mathias Agopian [Tue, 25 Jan 2011 22:46:40 +0000 (14:46 -0800)]
am
239fd805: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '
239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:35 +0000 (14:46 -0800)]
am
1955a5c9: Merge "partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
* commit '
1955a5c9da421dc89bb1a1dd3d3193159192cde9':
partially fix [
3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:31 +0000 (14:46 -0800)]
am
d0441f92: Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit '
d0441f921b2b1879fb44041f521d9bfaa5a547d0':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:27 +0000 (14:46 -0800)]
am
043a3cdd: Merge "workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '
043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [
3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:46:22 +0000 (14:46 -0800)]
am
d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflinger.so. (DO NOT MERGE)" into gingerbread
* commit '
d3fcd0a1c923498921107bb44fbc8b24582a170a':
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)
Mathias Agopian [Tue, 25 Jan 2011 22:43:21 +0000 (14:43 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
OSDN Git Service
