Commit Graph

41076 Commits

Author SHA1 Message Date
Jeff Brown
ffe281cef9 am 71ed608e: am 88089ccc: Merge "Wake on volume key when in dock. Bug: 5580373" into ics-mr1
* commit '71ed608ea7cfb349bba06c5f6bb17b525a4fd964':
  Wake on volume key when in dock. Bug: 5580373
2011-11-10 22:50:19 +00:00
Peter Ng
421f3ac7e0 am f52df796: am 15843aa5: Merge "lock pattern width spec set to max" into ics-mr1
* commit 'f52df7961f29a2f508fb7421f8cd9c95b9b409aa':
  lock pattern width spec set to max
2011-11-10 22:50:16 +00:00
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
The Android Open Source Project
a73769f296 Reconcile with ics-mr0-release
Change-Id: I16a4177148eb8ce12f14af9628c9f5143ba0b836
2011-11-10 14:35:36 -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
948b657756 am 08158c55: am bce7812b: Merge "Cleaning up tablet assets by deleting drawable-xlarge and large folders" into ics-mr1
* commit '08158c5526ded5599b183e5d8380809571e5c56a':
  Cleaning up tablet assets by deleting drawable-xlarge and large folders
2011-11-10 22:30:51 +00: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
bf5c2a987b am e36263be: am 49654c72: am 921afe39: Doc change: new Calendar content provider doc
* commit 'e36263be662d8ebac260e81f1fbac356a8362691':
  Doc change: new Calendar content provider doc
2011-11-10 22:25:37 +00: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
Adam Powell
d10e426026 am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1
* commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2':
  Fix access modifiers on ImageView overrides
2011-11-10 22:20:48 +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
Dianne Hackborn
25dfb16b84 am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:17:08 +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
Eric Fischer
e5ac00ec7b Merge "Import revised translations." 2011-11-10 14:06:21 -08:00
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