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
Eric Fischer
423eb5e44c
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
2011-05-26 11:36:58 -07:00
Wink Saville
2150dd3750
am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
...
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
Remove or disable some verbose debugging.
2011-05-26 11:07:18 -07:00
Dianne Hackborn
74ab5dd5c3
am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
Spiffy new compatibility mode UI.
2011-05-26 11:02:52 -07:00
Wink Saville
8f59d0771a
Merge "Remove or disable some verbose debugging." into honeycomb-LTE
2011-05-26 10:55:46 -07:00
Scott Main
31c9c2f91e
Merge "docs: add accepted values for setting status bar visibility"
2011-05-26 10:29:45 -07:00
Dianne Hackborn
86374d16ce
am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
...
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
Spiffy new compatibility mode UI.
2011-05-26 10:00:00 -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
Dianne Hackborn
0e7b61f1c3
Merge "Spiffy new compatibility mode UI." into honeycomb-mr2
2011-05-25 21:18:36 -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
Jeff Brown
c2dac80166
am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit 'a4e747445ac0bdd2cc561802c9c7abfedbd0d981':
Touch pad UX improvements.
2011-05-25 19:19:01 -07:00
Jeff Brown
de51c0988e
am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
...
* commit 'fa574c0e0ce7f84eea34e96dededea35329dbd18':
Touch pad UX improvements.
2011-05-25 19:16:39 -07:00
Jeff Brown
ab184a4855
Merge "Touch pad UX improvements." into honeycomb-mr2
2011-05-25 19:15:24 -07:00
Jeff Brown
17c614e241
am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-25 19:00:42 -07:00
Jeff Brown
657467eccd
am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
...
* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
Fix deadlock in dispatcher. (DO NOT MERGE)
2011-05-25 18:58:22 -07:00
Jeff Brown
8808af5c05
Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
2011-05-25 18:55:52 -07:00
Adam Powell
48fcbcf299
am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit 'b017632dad1c6a89cbdc02a9fa7a0029a7dbac12':
Updated popup dialog 9 patches (light)
2011-05-25 18:16:48 -07:00
Adam Powell
cf9055682e
am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
...
* commit '5a328f0f7cf88a2b917db15aec9f9d1714db3e06':
Updated popup dialog 9 patches (light)
2011-05-25 18:12:40 -07:00
Adam Powell
d97a0b6d77
Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
2011-05-25 18:10:22 -07:00
Romain Guy
0d56207474
Merge "Rename test to be able to launch it on crespo."
2011-05-25 17:49:50 -07:00
Joe Onorato
a20423e141
am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '94a06bd8db0d19be3108bd2ee709373f80318c8b':
Move status bar icons to sw600.
2011-05-25 17:42:27 -07:00
Joe Onorato
a343131719
am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
...
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
Move status bar icons to sw600.
2011-05-25 17:39:04 -07:00
Joe Onorato
e7346081dd
Merge "Move status bar icons to sw600." into honeycomb-mr2
2011-05-25 17:36:54 -07:00
Dianne Hackborn
717d0dee49
resolved conflicts for merge of 77dd616e to master
...
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
2011-05-25 16:36:50 -07:00
Jeff Hamilton
5099f41cd4
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f':
Swap Mifare for MIFARE.
2011-05-25 16:32:12 -07:00
Joe Onorato
19217ac44f
am a2a605a9: am c112118a: Merge "move resources" into honeycomb-mr2
...
* commit 'a2a605a958ae8443e54b7a2607bc71501682f9ae':
move resources
2011-05-25 16:25:02 -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 Hamilton
a9a3305673
am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
...
* commit '14019abb40785064ebef5d14e82586a910d33181':
Swap Mifare for MIFARE.
2011-05-25 15:41:51 -07:00
Jeff Hamilton
0d389cc6ab
Merge "Swap Mifare for MIFARE." into honeycomb-mr2
2011-05-25 15:38:56 -07:00
Joe Onorato
7f3c73a330
am c112118a: Merge "move resources" into honeycomb-mr2
...
* commit 'c112118a9091aa69ea70fea7c23f1e078ee87908':
move resources
2011-05-25 15:23:26 -07:00
Joe Onorato
ddc3f51233
Merge "move resources" into honeycomb-mr2
2011-05-25 15:18:56 -07:00
James Dong
53536d771e
am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:57:45 -07:00
James Dong
2d93c9cbd2
am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:54:19 -07:00
James Dong
f050cd0782
Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
2011-05-25 14:51:52 -07:00
Jeff Brown
76a5b2ae10
am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
...
* commit '6ef142a05081333f104abde225af9eccd1b92d6c':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-25 14:49:20 -07:00
Jeff Brown
8b8391edb3
am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
...
* commit '53c3d5b1d5ba00c7be444a358a5fa678de44f6cd':
Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-25 14:46:57 -07:00
Jeff Brown
98d1f99704
am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
...
* commit '8148cc3e47e50c916066e2fed562618b5827188f':
Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-25 14:46:53 -07:00
Jeff Brown
6f5893ff6c
am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
...
* commit 'e8dc05aa6d2f4138729438281485ca10d854dc8d':
Add a sprite controller. (DO NOT MERGE)
2011-05-25 14:46:50 -07:00
Jeff Brown
974a08d53e
am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
...
* commit 'd5358874e2cc90be3d7d3370ef7342c96c212451':
Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
2011-05-25 14:46:37 -07:00