Commit Graph

40428 Commits

Author SHA1 Message Date
Eino-Ville Talvala
0f0fb50cca am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1
* commit 'c1c5d4faa22a7d22b8225b2bbf83206698b83763':
  Add a sound-playing method to Camera API.
2011-11-10 20:08:29 +00:00
Eino-Ville Talvala
583486f5db Merge "Add a sound-playing method to Camera API." into ics-mr1 2011-11-10 12:07:05 -08:00
Mathias Agopian
09eedc8fb7 am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1
* commit '785fd3685a69e5b3ef9c0958dcf4ae85f818e78d':
  handle EINTR when calling sensor HAL's poll function
2011-11-10 18:35:48 +00:00
Mathias Agopian
55adfca3a2 Merge "handle EINTR when calling sensor HAL's poll function" into ics-mr1 2011-11-10 10:33:55 -08:00
John Reck
65248735e9 am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '843e04d977fd348ed474da1d3c6a62e7dc837444':
  Pause drawing when not visible
2011-11-10 17:21:43 +00:00
John Reck
7b9d0dcc13 Merge "Pause drawing when not visible" into ics-mr1 2011-11-10 09:19:55 -08:00
Andreas Huber
d1b45c7649 am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '2375d16378e6f8b7694c5a2cd9e0622e382e6049':
  Send RTSP control connection keep-alive requests
2011-11-10 16:51:59 +00:00
Andreas Huber
56cb30e10d am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit 'b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
  Don't believe the PV decoder's lies...
2011-11-10 16:51:58 +00:00
Andreas Huber
09a30415bd am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
  There's no point in trying to continue to decode after an error was signalled.
2011-11-10 16:48:53 +00:00
Andreas Huber
51b0522efd Merge "Send RTSP control connection keep-alive requests" into ics-mr1 2011-11-10 08:48:44 -08:00
Andreas Huber
9e2f3ff522 Merge "Don't believe the PV decoder's lies..." into ics-mr1 2011-11-10 08:48:34 -08:00
Andreas Huber
5b119b4020 Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1 2011-11-10 08:47:25 -08:00
George Mount
b15b8c3530 am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1
* commit 'c60baec7a737d3c3cd596c5c4378a6e12450da3d':
  DO NOT MERGE Set the initial scroll position for RTL.
2011-11-10 16:34:16 +00:00
George Mount
58365bf2d8 Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1 2011-11-10 08:32:18 -08:00
Eric Laurent
8284989ab6 am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1
* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
  Fix problems in tablet silent mode.
2011-11-10 16:30:22 +00:00
Eric Laurent
a6679903c2 Merge "Fix problems in tablet silent mode." into ics-mr1 2011-11-10 08:28:58 -08:00
Wink Saville
8721d2a5c3 am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit 'a092ba5667e9c055f4d5c83296c8c81471695747':
  [maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 15:25:03 +00:00
Wink Saville
b057de6cbf am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit 'e562287c85662457864255028cd4bc3b04f13750':
  [maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 15:22:35 +00:00
Wink Saville
c21e69922e Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0 2011-11-10 07:20:55 -08:00
Gilles Debunne
8a34d4deef am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1
* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
  Visual glitches when starting extracted text
2011-11-10 08:49:51 +00:00
Gilles Debunne
29c5ea8fc0 Merge "Visual glitches when starting extracted text" into ics-mr1 2011-11-10 00:48:10 -08:00
Dave Burke
083f9a2943 am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit 'b5dbf66c7538838eda29b75309234f20720170d1':
  Actually 59 fps DO NOT MERGE
2011-11-10 08:01:47 +00:00
Dave Burke
eeb561cc70 am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit 'b96194308dc8678e99564f038872061e4881e65a':
  Actually 59 fps DO NOT MERGE
2011-11-10 07:59:32 +00:00
Dave Burke
91d3e052f5 Merge "Actually 59 fps DO NOT MERGE" into ics-mr0 2011-11-09 23:58:09 -08:00
Dave Burke
1f62c75dd3 Actually 59 fps DO NOT MERGE
Change-Id: Ic70dbba81c054eaaf21f71b10e329ebf1424d4a2
2011-11-09 23:53:51 -08:00
Dave Burke
a412007eee am ab22f862: Merge "Back to 59fps" into ics-mr1
* commit 'ab22f862a912035ba83591db448806fd81ed74f4':
  Back to 59fps
2011-11-10 07:50:19 +00:00
Dave Burke
09d940c770 Merge "Back to 59fps" into ics-mr1 2011-11-09 23:49:09 -08:00
satok
10c994faef am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
* commit '114c4d3843758a2a1ffb32eb2719d65cdee637f8':
  Introduce an API to cancel pending/running spell check tasks
2011-11-10 05:28:47 +00:00
satok
a77fbd8aac Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1 2011-11-09 21:26:46 -08:00
Daniel Sandler
d784eada4b am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
* commit 'bca520a170f84c8be840e629841d0dc7d7cb273b':
  Use platform assets for brightness scrubber.
2011-11-10 04:42:15 +00:00
Daniel Sandler
9e479b9bb5 Merge "Use platform assets for brightness scrubber." into ics-mr1 2011-11-09 20:41:03 -08:00
Wink Saville
f3fe9a877d am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '08b3ffe61182b60ded3bfa599778b6f5495e87db':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:44:27 +00:00
Wink Saville
7deb3f9dca am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 03:42:09 +00:00
Wink Saville
4424381fce Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0 2011-11-09 19:39:39 -08:00
satok
e35b865f49 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
2011-11-10 02:44:24 +00:00
satok
e757bb395c Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1 2011-11-09 18:42:48 -08:00
Dave Burke
2f78cf1122 Back to 59fps
Change-Id: I8d89e5e27f1abc5a2e36cb832eb4db2ca83c2cc6
2011-11-09 17:54:37 -08:00
Mathias Agopian
ca6a7d32e0 am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
* commit '42694dc4a7af4f38e39cb26a852f3f75e730bb05':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:44:27 +00:00
Mathias Agopian
a36f977278 am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
* commit '3e458306b0caf4e21294acc58286b24bda08a242':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 00:41:43 +00:00
Mathias Agopian
1761a32f2e Set the WM refresh rate to 60 Hz for tuna devices only DO
NOT MERGE

This approach is TEMPORARY until we can do this properly.

Change-Id: I81a8f852df501b2faccffdae7cac954855a6c98f
2011-11-09 16:01:07 -08:00
Jim Miller
f795a58c90 am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '270826a8878b5470d48d93ca3d518ac93860870d':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-09 23:21:39 +00:00
Eric Fischer
59f0407aab am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '6b992090f6eb1e14553be22373799258bb401e3d':
  Import revised translations.  DO NOT MERGE
2011-11-09 23:21:38 +00:00
Jim Miller
8e540328fc Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1 2011-11-09 15:19:31 -08:00
Eric Fischer
36fa0af67c am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '3124bf64404dbb90cc521abf4c7bf8d438346362':
  Import revised translations.  DO NOT MERGE
2011-11-09 23:18:10 +00:00
Eric Fischer
7818a16c82 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-09 15:15:42 -08:00
Robert Ly
3f3aca8f5a am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
* commit '69db56958fdac41a093cd6cf00cbe200f2885730':
  docs: update samples toc for rs sample
2011-11-09 21:28:23 +00:00
Robert Ly
3e22d75179 am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
* commit 'bd4bdbec62776b1222b1f202e44f8f127bfb7bab':
  docs: update samples toc for rs sample
2011-11-09 21:25:45 +00:00
Robert Ly
341e1624ab Merge "docs: update samples toc for rs sample" into ics-mr0 2011-11-09 13:23:34 -08:00
Jamie Gennis
d4e367fb86 am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1
* commit '97ece7a95f76ec724633d4f4764291ea4dc20933':
  EGL: add deferred saving of the cache
2011-11-09 19:48:29 +00:00
Jamie Gennis
72f172e79f Merge "EGL: add deferred saving of the cache" into ics-mr1 2011-11-09 11:46:45 -08:00