Commit Graph

40901 Commits

Author SHA1 Message Date
Adam Powell
7b000f190c am ba44080d: am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1
* commit 'ba44080d834d23d0bc7d118a4950f837eeaca96a':
  Fix bug 5581874 - Animated drawables don't start as expected
2011-11-10 22:01:58 +00:00
Adam Powell
53eaddf079 am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t start as expected" into ics-mr1
* commit '67121fd7b241ceafe7339f5f154781572819f87b':
  Fix bug 5581874 - Animated drawables don't start as expected
2011-11-10 21:58:30 +00:00
Adam Powell
8fe37bdd55 Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ics-mr1 2011-11-10 13:57:24 -08:00
Martijn Coenen
daa68acf20 am 7ee88289: (-s ours) am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1
* commit '7ee88289091f8bc81dabeff62f215ba21baa8c0b':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
2011-11-10 21:53:49 +00:00
Martijn Coenen
6f66f54d92 am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
  Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
2011-11-10 21:50:21 +00:00
Chet Haase
5e29c2a6f7 am 68a15583: am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '68a15583f7438c687e3b029f83cf80ca7827ff31':
  increase the rate at which we dispatch events.
2011-11-10 21:49:30 +00:00
Martijn Coenen
73811644be Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1 2011-11-10 13:48:02 -08:00
Chet Haase
bdb1e90e26 am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
2011-11-10 21:46:16 +00:00
Chet Haase
0a55276715 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
ad447279fb am f4db2fe5: am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'f4db2fe56479635f8ec0a195e9e6b53a55216139':
  Close file on exception as well
2011-11-10 21:23:24 +00:00
Kenny Root
f0cc2b7561 am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
2011-11-10 21:20:28 +00:00
Kenny Root
bc27c00e07 Merge "Close file on exception as well" into ics-mr1 2011-11-10 13:18:24 -08:00
Tom Taylor
396de53911 am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
* commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f':
  Revert "Add new secure setting for controlling Messaging notifications"
2011-11-10 21:16:54 +00:00
Tom Taylor
a5fd059af4 am faa81c82: Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1
* commit 'faa81c82103e89a3f2c86c4e737d9beb7e557402':
  Revert "Add new secure setting for controlling Messaging notifications"
2011-11-10 21:13:42 +00:00
Tom Taylor
7b3e285fc3 Merge "Revert "Add new secure setting for controlling Messaging notifications"" into ics-mr1 2011-11-10 13:11:16 -08:00
Eino-Ville Talvala
cd0d6edda4 am 22c2d1d6: am c1c5d4fa: Merge "Add a sound-playing method to Camera API." into ics-mr1
* commit '22c2d1d6ae48c348f4c331361a6e3f2c63b2aa8f':
  Add a sound-playing method to Camera API.
2011-11-10 20:10:47 +00:00
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
73090ff24b am e1d50e0c: am 785fd368: Merge "handle EINTR when calling sensor HAL\'s poll function" into ics-mr1
* commit 'e1d50e0ccb95f06d1d60aa83822b486828148483':
  handle EINTR when calling sensor HAL's poll function
2011-11-10 19:39:53 +00:00
John Reck
c817afdc97 am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1
* commit '0f0777399defe6bca965d9c33e9dfe256eb56fee':
  Pause drawing when not visible
2011-11-10 19:39:46 +00:00
Andreas Huber
ccc0346cbf am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
  Send RTSP control connection keep-alive requests
2011-11-10 19:39:38 +00:00
Andreas Huber
559128e672 am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
  Don't believe the PV decoder's lies...
2011-11-10 19:39:36 +00:00
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
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
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
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
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