Commit Graph

40871 Commits

Author SHA1 Message Date
Andreas Huber
e5db228956 am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
  There's no point in trying to continue to decode after an error was signalled.
2011-11-10 19:39:34 +00:00
George Mount
30d10c1e85 am 8645ff3d: (-s ours) am c60baec7: Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1
* commit '8645ff3d00d22abaf74b5985a036bffc7843825e':
  DO NOT MERGE Set the initial scroll position for RTL.
2011-11-10 19:39:31 +00:00
Eric Laurent
13d77ee0cf am 58f3a712: am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1
* commit '58f3a7123d0da6d35424429f3c0bbfbd32c00117':
  Fix problems in tablet silent mode.
2011-11-10 19:39:29 +00:00
Wink Saville
146f66684d am 99d858b0: am a092ba56: am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
* commit '99d858b04b27b51e346fb5d3860e6953cee64ecd':
  [maguro] Update COMPREHENSION-TLV parser in CAT
2011-11-10 19:39:27 +00:00
Gilles Debunne
2b35f22afa am 2e97db49: am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1
* commit '2e97db4981e7773e84deee37c394748076b1aafd':
  Visual glitches when starting extracted text
2011-11-10 19:39:16 +00:00
Dave Burke
a7a5ec6a8d am 26c84db4: (-s ours) am b5dbf66c: am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0
* commit '26c84db47da032a3fc1a56aa6bd82d610dde2dca':
  Actually 59 fps DO NOT MERGE
2011-11-10 19:39:12 +00:00
Dave Burke
bbcd7ea184 am 65a9ac43: am ab22f862: Merge "Back to 59fps" into ics-mr1
* commit '65a9ac43c687d9011279c09210adaa04eb4a5502':
  Back to 59fps
2011-11-10 19:39:11 +00:00
satok
36178d3d80 am 3869eac4: am 114c4d38: Merge "Introduce an API to cancel pending/running spell check tasks" into ics-mr1
* commit '3869eac42b3d6fc0ecef8f096fbb4b5ddafca6f7':
  Introduce an API to cancel pending/running spell check tasks
2011-11-10 19:39:08 +00:00
Daniel Sandler
8e686f5004 am 9cc4efb3: am bca520a1: Merge "Use platform assets for brightness scrubber." into ics-mr1
* commit '9cc4efb39054557cfac11e0c7ba5887f102579d3':
  Use platform assets for brightness scrubber.
2011-11-10 18:51:15 +00:00
Wink Saville
5603cb4bf3 am f1633291: am 08b3ffe6: am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
* commit 'f1633291aa13ee1bd210a38e007b9e133c178f37':
  Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
2011-11-10 18:51:11 +00:00
satok
c50d3a3cde am 3628dafe: am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '3628dafe22aeeb2fca09b49d82c8d7289baf68ad':
  Respect user settings for spell checking language if explicitly set
2011-11-10 18:34:45 +00:00
Mathias Agopian
a0cec24ee9 am c2e3b33b: (-s ours) am 42694dc4: am 3e458306: (-s ours) Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
* commit 'c2e3b33b1f2399a9165b94b42dda46535bb857bf':
  Set the WM refresh rate to 60 Hz for tuna devices only DO NOT MERGE
2011-11-10 18:34:41 +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
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
Steve Block
a843772311 Merge "Add tests for arrays in WebView's Java Bridge" 2011-11-10 08:44:57 -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
Tsu Chiang Chuang
fa8d457bc7 Merge "Adding mobile microbenchmark tests." 2011-11-10 08:16:04 -08:00
Jim Miller
46c8dbad85 am 5943c1dc: am 270826a8: Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
* commit '5943c1dc406574b360e9cb1343a5dab00a84a8e2':
  Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
2011-11-10 16:15:14 +00:00
Eric Fischer
6f2eae3e37 am bf3f6f42: (-s ours) am 6b992090: am 3124bf64: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit 'bf3f6f42775910544b9292ac1eb8bcdf1d1696d3':
  Import revised translations.  DO NOT MERGE
2011-11-10 16:15:12 +00:00
Robert Ly
eb11c2d9b1 am 07e95523: am 69db5695: am bd4bdbec: Merge "docs: update samples toc for rs sample" into ics-mr0
* commit '07e9552308a1ba49312931b193c06cb6ba822d22':
  docs: update samples toc for rs sample
2011-11-10 16:14:53 +00:00
Jamie Gennis
afbd3cb6b1 am 1bf15e79: am 97ece7a9: Merge "EGL: add deferred saving of the cache" into ics-mr1
* commit '1bf15e79dcc89229c599987ed795e3fd99bcbc88':
  EGL: add deferred saving of the cache
2011-11-10 16:14:45 +00:00
Jeff Brown
92ac679fee am 698d3de6: am e7de36e6: Merge "Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022" into ics-mr1
* commit '698d3de681bf85047675baa61f9b28961f3d6862':
  Throw TransactionTooLargeException when Binder transaction fails. Bug: 5578022
2011-11-10 16:14:43 +00:00
Peter Ng
011daf74e3 am cf83c070: am 34dd937b: Merge "Making quicksettings opaque again" into ics-mr1
* commit 'cf83c070e3caa3ee6e5df8a4e6545ae43cb08a35':
  Making quicksettings opaque again
2011-11-10 16:14:40 +00:00
Gilles Debunne
f8ed836c57 Merge "Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically" 2011-11-10 08:13:55 -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
b37c5d1fb0 Merge "Bug 5575396: close spell session on language change" 2011-11-10 02:10:45 -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
John Reck
a1b3bc1893 am 0e17f653: am 36a7f2a9: Merge "Fix determining find on page overlap" into ics-mr1
* commit '0e17f65312e57c7f1489010284987c505142b778':
  Fix determining find on page overlap
2011-11-10 05:42:49 +00:00
The Android Open Source Project
76e498ec3f am ef725e83: am eae6c997: Reconcile with ics-mr0-release
* commit 'ef725e83acce5fc7904a5a47aac501fc0e8ea3c6':
2011-11-10 05:42:44 +00:00
Jean-Michel Trivi
57fa60ebec am 036da419: am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode
2011-11-10 05:42:39 +00: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