Jeff Brown
9bbfc2c412
am 54bd4cae: (-s ours) am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '54bd4caeabc5daddfce56269949daccd8e7bf661':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-26 11:38:58 -07:00
Jeff Brown
fd8a76b9d1
am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-26 11:38:48 -07:00
Jeff Brown
eed8d87a0d
am 7d0fb570: (-s ours) am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '7d0fb57044576fd4bbaf9683997bab288c3b759c':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-26 11:38:35 -07:00
Jeff Brown
966b5f9055
am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-26 11:38:24 -07:00
Scott Main
31c9c2f91e
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Andreas Huber
12673736ec
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
2011-05-26 08:52:55 -07:00
Debashish Chatterjee
de335ca8ec
Merge "framework/base changes to add new voicemail provider sample."
2011-05-26 07:45:28 -07:00
Daniel Sandler
198b7d0d9e
Merge "Framework support for Android Dreams."
2011-05-26 06:01:41 -07:00
Joe Onorato
db53a23dc0
am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
Make adb shell am display-size persistent.
2011-05-25 21:29:07 -07:00
Dianne Hackborn
09f8d45589
am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 21:28:39 -07:00
Amith Yamasani
f0654ca13d
am 361c286d: (-s ours) am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
...
* commit '361c286d095a22152750e73b01bfc6b1d2076a4d':
More preference item visual adjustments for smaller tablets. DO NOT MERGE
2011-05-25 21:28:31 -07:00
Russell Brenner
48567a8ad8
am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
...
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 21:27:41 -07:00
Mike Lockwood
cba23fa4cd
Merge "Environment: Fix default mount point for external storage"
2011-05-25 20:36:05 -07:00
Dianne Hackborn
128682606b
Merge "resolved conflicts for merge of 77dd616e to master"
2011-05-25 20:35:04 -07:00
Gloria Wang
4bb4da8653
Merge "For out of band timed text support (timed text in a separate file)."
2011-05-25 20:11:25 -07:00
Romain Guy
0d56207474
Merge "Rename test to be able to launch it on crespo."
2011-05-25 17:49:50 -07:00
Dianne Hackborn
717d0dee49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Eric Laurent
2f3a10cff5
Merge "Issue 4364098: bluetooth SCO not working"
2011-05-25 16:22:36 -07:00
Jamie Gennis
e2c8543391
Merge changes I09a74538,I08d96b38,Ic1d3344b
...
* changes:
SurfaceTexture: disable a failing test.
SurfaceTexture: fix an error check in dequeueBuffer.
SurfaceTexture: clean up some comments, tests, etc.
2011-05-25 15:54:35 -07:00
Jeff Brown
c7e80e70bf
am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '8ea6e6411c9616da4add0d6304a7b2f453356889':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-25 14:42:24 -07:00
Jeff Brown
9a2c1ca2dd
am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit 'af685f3bb566f297deee1615d55d4f33d5580ba3':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-25 14:42:20 -07:00
Jeff Brown
689e53cc82
am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '16330e249663fed890df0e95fce4016c2971120a':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-25 14:42:06 -07:00
Jeff Brown
446b400910
am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '4bd89fb00f319c5d6d4f17b39fd4c0b3dc827ad1':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:42:01 -07:00
Jeff Brown
ffb80b8a48
am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '266ea6b091d572eaa153e70574da97752b97180b':
Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-25 14:35:34 -07:00
Jeff Brown
270f43e008
am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '85a7f99cfe066f054d4ddf4feb737f0395c9943b':
Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-25 14:35:21 -07:00
Jeff Brown
8cfb70cd82
am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '94e838f6e113f8cad30086a18f68da99976101d0':
Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-25 14:34:57 -07:00
Jeff Brown
b3e35952c0
am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '82e4373ed3775395a23d161e58c003e82511921a':
Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-25 14:34:48 -07:00
Jeff Brown
d6ddc00178
Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:54 -07:00
Jeff Brown
581a5c2334
Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:50 -07:00
Jeff Brown
a88b2beb05
Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:44 -07:00
Jeff Brown
bf7493c52b
Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 14:31:38 -07:00
James Dong
ff0e84432f
Merge "Convert line breaks to Unix style"
2011-05-25 12:37:07 -07:00
Jamie Gennis
8dda6b7bf8
SurfaceTexture: disable a failing test.
...
The SurfaceTextureSyncModeWaitRetire test was disabled. It is failing
because of the synchronization hacks that were added to SurfaceTexture
to work around bugs in vendor device drivers.
Change-Id: I09a74538bfe14a04833acb6847471e00826cc7fc
2011-05-25 12:27:33 -07:00
Jamie Gennis
c2c8dfd71b
SurfaceTexture: fix an error check in dequeueBuffer.
...
This change fixes the MIN_UNDEQUEUED_BUFFERS error check in
dequeueBuffer. The check should only be performed if a buffer has been
queued since the last time the buffer count was changed by the client.
The check must be applied conditionally because video decoders require
all the bufferes to be dequeued and registered before beginning the
decode.
Change-Id: I08d96b380544e395c2fcf0f3983a199bfd695b09
2011-05-25 12:27:33 -07:00
Jamie Gennis
8cd5ba4b7f
SurfaceTexture: clean up some comments, tests, etc.
...
This change fixes up some stale comments, member variable names, log
messages and disables a failing test.
Change-Id: Ic1d3344b18066cf710e4a42838b2417c6b1f2f6c
2011-05-25 12:27:33 -07:00
Kristian Monsen
d958485844
Merge "Merge chromium to 10.0.634.0: Compile fix"
2011-05-25 12:09:56 -07:00
Kristian Monsen
da846dd889
Merge "Merge Chromium at 10.0.634.0: Add autofill fax string"
2011-05-25 12:09:46 -07:00
Adam Powell
21ab86c0ec
Merge "Action bar tab layout"
2011-05-25 12:01:00 -07:00
Joe Onorato
dd96bb7e08
am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '2c09a9c0e960163a16ad1d06055aa6ee9635c693':
Make adb shell am display-size persistent.
2011-05-25 11:46:28 -07:00
Joe Onorato
cc5dee303a
am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2
...
* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
Make adb shell am display-size persistent.
2011-05-25 11:43:06 -07:00
Joe Onorato
53cf6971a0
Merge "Make adb shell am display-size persistent." into honeycomb-mr2
2011-05-25 11:40:59 -07:00
Dianne Hackborn
ca09978883
am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit 'd6f29cd8f92b098330818227428f5a42836097b7':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 11:18:59 -07:00
Dianne Hackborn
b6c674f85c
am 2a15eb55: Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
...
* commit '2a15eb559cfc18800b3e345995df76695a3ae4b2':
Fix issue #4445007 : DPM initializes some values to 1, instead of 0
2011-05-25 11:14:13 -07:00
Dianne Hackborn
55f6d6e82b
Merge "Fix issue #4445007 : DPM initializes some values to 1, instead of 0" into honeycomb-mr2
2011-05-25 11:10:15 -07:00
Amith Yamasani
d7756a38c9
am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
...
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b':
More preference item visual adjustments for smaller tablets. DO NOT MERGE
2011-05-25 11:08:30 -07:00
Russell Brenner
0accfc6025
Merge "merge from honeycomb mr2"
2011-05-25 11:04:28 -07:00
Amith Yamasani
d8b5ac8ca9
am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
...
* commit '99a8e1d2931f4deb35c54f144de26fc6124de5fc':
More preference item visual adjustments for smaller tablets. DO NOT MERGE
2011-05-25 11:02:01 -07:00
Amith Yamasani
c207d53276
Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2
2011-05-25 10:58:24 -07:00
Brian Carlstrom
6bd7414b12
Merge "Remove need for onActivityResult from KeyChain API"
2011-05-25 10:30:36 -07:00
Eric Laurent
416b5cc521
Merge "Bluetooth SCO audio API improvements."
2011-05-25 10:13:49 -07:00