Commit Graph

40901 Commits

Author SHA1 Message Date
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
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
David Brown
98312da7ec am 6e82e95c: am b6b44cef: am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
* commit '6e82e95c08bd1e2c46837e9ddb8759e5ca977f84':
  Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
2011-11-10 01:11:37 +00:00
Glenn Kasten
ddb19f8d83 am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '874641f1331f3b37e8b2d930ed942fb6ca522501':
2011-11-10 01:11:35 +00:00
Jake Hamby
44a0052e04 am 0fc2847b: am 9c5c97f6: am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
* commit '0fc2847bd5ad1997e04c73e33a258511d5388569':
2011-11-10 01:11:34 +00:00
Eric Laurent
4bc7ecdd0c am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit 'db7d79e6f1e1860a9bfe4756a03c753435fd0ddf':
  Fix regression for SoundPool playback
2011-11-10 01:11:28 +00:00
Brian Colonna
9f9603c77f am c8c5bc44: am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
* commit 'c8c5bc443fe63e96c91fc96bf8db8ce7dd177073':
2011-11-10 01:11:26 +00: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
Gilles Debunne
d01596dff1 am 7e7b4e7c: (-s ours) am 76bb11ca: Merge "Bug 5575396: close spell session on language change" into ics-mr1
* commit '7e7b4e7c822e7c9aacbe4add52511079cff757cc':
  Bug 5575396: close spell session on language change
2011-11-10 00:03:56 +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
George Mount
cf6e360bdd Merge "Set the initial scroll position for RTL." 2011-11-09 15:15:42 -08:00
Eric Fischer
7818a16c82 Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-09 15:15:42 -08:00
Andreas Huber
ff06492eb2 Merge "Instead of asserting, remove active streams if their sockets return failure" 2011-11-09 14:47:51 -08:00
Jeff Sharkey
b26caf7838 am 33e3710a: am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
2011-11-09 21:51:40 +00:00
Jeff Sharkey
52bb4d09e7 am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
2011-11-09 21:51:38 +00:00