Alon Albert
61d36d7cc4
Merge "Support quoted parameters" into gingerbread
2011-02-22 10:31:26 -08:00
Maarten Hooft
1db90719b3
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-17 17:17:40 -08:00
Robert Greenwalt
b9ce99c940
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
2011-02-16 10:44:26 -08:00
Alon Albert
b088416f08
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
2011-02-16 10:20:13 -08:00
Andreas Huber
071969e5d3
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
2011-02-16 08:50:37 -08:00
Robert Ly
08f2087b06
Merge "Adding package summary for nfc.tech package" into gingerbread
2011-02-15 17:44:56 -08:00
John Wang
6ac7359b83
Merge "Only decode EXT1 tag when it is available." into gingerbread
2011-02-15 12:34:37 -08:00
Mathias Agopian
6cb8fc11ee
Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread
2011-02-09 13:06:00 -08:00
Jeff Hamilton
0858b00d05
Merge "More documentation updates for NFC." into gingerbread
2011-02-09 00:34:22 -08:00
Dirk Dougherty
6e0c56dfe3
Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread
2011-02-08 23:24:22 -08:00
Jeff Hamilton
c9cda41f02
Merge "Improve the docs a bit for foreground dispatch." into gingerbread
2011-02-08 19:30:47 -08:00
Eric Fischer
021223d742
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-02-08 10:00:24 -08:00
Dirk Dougherty
88902d0549
Merge "Doc change: Add diff report for api 10." into gingerbread
2011-02-07 17:21:56 -08:00
Gilles Debunne
35dc5f703a
Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
2011-02-04 15:46:15 -08:00
Gilles Debunne
83d390f8fc
Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread
2011-02-04 15:46:11 -08:00
Gilles Debunne
ae4c508672
Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread
2011-02-04 15:46:06 -08:00
Joe Onorato
51a2bdc437
Merge "Managed dialogs should run on the same thread as their activity." into gingerbread
2011-02-03 18:05:20 -08:00
Nick Pelly
344ff4b82c
Merge "Fix docs type that broke build." into gingerbread
2011-02-03 16:27:51 -08:00
Scott Main
71d29541b4
Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
2011-02-03 15:24:40 -08:00
Nick Pelly
eef4bf96a1
Merge "NFC documentation overhaul." into gingerbread
2011-02-03 15:23:17 -08:00
Jean-Baptiste Queru
c9b062ecde
Merge from open-source gingerbread
...
Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
2011-02-03 14:05:23 -08:00
Jean-Baptiste Queru
81f81875bc
Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread
2011-02-03 14:02:59 -08:00
Jean-Baptiste Queru
60bcbd0eae
Merge from open-source gingerbread
...
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2011-02-03 12:41:51 -08:00
Jean-Baptiste Queru
05e90f057a
Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
2011-02-03 12:17:47 -08:00
Scott Main
eba0a98abd
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
2011-02-02 16:38:25 -08:00
Jean-Baptiste Queru
907b884345
Merge from open-source gingerbread
...
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
5e06b988ab
Merge "fix for supporting 3 digits MNC code" into gingerbread
2011-02-02 09:44:16 -08:00
Nick Pelly
790911fae0
Merge "Final final final Gingerbread MR API changes." into gingerbread
2011-02-01 09:39:31 -08:00
Dianne Hackborn
1059827471
Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread
2011-01-31 17:41:54 -08:00
Eric Fischer
1e01e3de0b
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-31 16:08:52 -08:00
Jean-Baptiste Queru
02bac86968
Merge from open-source gingerbread
...
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
2011-01-30 15:30:03 -08:00
Jean-Baptiste Queru
9b1515590c
Merge "fix failing thread object run" into gingerbread
2011-01-30 15:17:33 -08:00
Dianne Hackborn
a7ba815307
Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread
2011-01-29 22:20:05 -08:00
Robert Greenwalt
62e5b62d7f
Merge "Add some network types that OEM's are asking for." into gingerbread
2011-01-29 06:38:35 -08:00
Eric Fischer
bb3356d637
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-28 14:10:43 -08:00
Dirk Dougherty
11057a96fd
Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
2011-01-28 11:57:42 -08:00
Eric Laurent
f8edaa87a6
Merge "Fix issue 2988031." into gingerbread
2011-01-27 18:37:04 -08:00
Jim Miller
ddccfdc3d4
Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
2011-01-27 18:22:14 -08:00
Nick Pelly
d4e1ed1fff
Merge "API: Make close() throw an IOException." into gingerbread
2011-01-27 16:23:35 -08:00
Eric Fischer
77c85a0ead
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-01-27 14:56:29 -08:00
Scott Main
e000729397
Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread
2011-01-27 13:25:10 -08:00
Nick Pelly
07a30ef34b
Merge "Clean up MifareUltralight API." into gingerbread
2011-01-27 12:23:53 -08:00
Robert Greenwalt
08f897d2b3
Merge "Update networktype before sending state change." into gingerbread
2011-01-27 10:17:33 -08:00
Scott Main
e0f78c41aa
Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread
2011-01-26 17:52:08 -08:00
Dianne Hackborn
afb1ae6448
Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread
2011-01-26 13:59:42 -08:00
Kenny Root
30acaa8851
Merge "Make OBB results a one-way call" into gingerbread
2011-01-26 09:17:28 -08:00
Ritu Srivastava
5ee1a0c5ee
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>
2011-01-25 21:48:54 -08:00
Jeff Hamilton
1b9429f227
Merge "Fix the build, proper current.xml." into gingerbread
2011-01-25 16:11:37 -08:00
Mathias Agopian
01749e731c
Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:21 -08:00
Mathias Agopian
e3f0ec9f87
Merge "partially fix [3306150] HTML5 video with H/W acceleration blackout (DO NOT MERGE)" into gingerbread
2011-01-25 14:43:14 -08:00
