Jeff Brown
|
46fd7f769a
|
am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '88089ccc79ee7ba5f48ade9bb73a99cf05f6ec62':
Wake on volume key when in dock. Bug: 5580373
|
2011-11-10 22:42:49 +00:00 |
|
Jeff Brown
|
6d751cea72
|
Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
|
2011-11-10 14:40:48 -08:00 |
|
Peter Ng
|
9111cc3b61
|
am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1
* commit '15843aa5f66fee8eee5e634508dbf83a4e5ab55d':
lock pattern width spec set to max
|
2011-11-10 22:32:53 +00:00 |
|
Peter Ng
|
53de2e881a
|
Merge "lock pattern width spec set to max" into ics-mr1
|
2011-11-10 14:31:09 -08:00 |
|
Peter Ng
|
82811ef736
|
am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
* commit 'bce7812baba05e969406f8644595ef6237e16a41':
Cleaning up tablet assets by deleting drawable-xlarge and large folders
|
2011-11-10 22:28:33 +00:00 |
|
Peter Ng
|
531fc2b4b3
|
Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
|
2011-11-10 14:26:57 -08:00 |
|
Katie McCormick
|
572de305e5
|
am 49654c72: am 921afe39: Doc change: new Calendar content provider doc
* commit '49654c72344610032bbff4405024fad2b30e1100':
Doc change: new Calendar content provider doc
|
2011-11-10 22:23:25 +00:00 |
|
Katie McCormick
|
19ddec5461
|
am 921afe39: Doc change: new Calendar content provider doc
* commit '921afe39d6041b06c6a002b08f9dcd1561a9ae99':
Doc change: new Calendar content provider doc
|
2011-11-10 22:20:37 +00:00 |
|
Adam Powell
|
0eeaa92fc3
|
am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
Fix access modifiers on ImageView overrides
|
2011-11-10 22:18:55 +00:00 |
|
Adam Powell
|
42fc2736d2
|
Merge "Fix access modifiers on ImageView overrides" into ics-mr1
|
2011-11-10 14:16:45 -08:00 |
|
Dianne Hackborn
|
1749ec7560
|
am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
Fix issue #5470311: Activity with android:configChanges defined...
|
2011-11-10 22:14:33 +00:00 |
|
Dianne Hackborn
|
0df52ee122
|
Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
|
2011-11-10 14:12:25 -08: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
|
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 |
|
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
|
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
|
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
|
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 |
|