Joe Malin
09eaf6019c
am 761b8440: am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
...
* commit '761b84409135641ec27bb828dbd8a1d04a7252fe':
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:12:37 -08:00
Joe Malin
6cc95a9743
am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
...
* commit '9f18729676a58cdfcee98db3329de3397c657d48':
DOC CHANGE: Fix 4084450 monkeyrunner_concepts
2011-03-11 13:10:29 -08:00
Joe Malin
447b17ba91
Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb
2011-03-11 13:08:59 -08:00
Mike Lockwood
bac02fd025
am 0eb7b697: Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
...
* commit '0eb7b697b7c180660647b5cd0cd7dd067f6b6abb':
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
2011-03-11 11:37:14 -08:00
Mike Lockwood
e195b4bc54
Merge changes Ib63ab95a,I585b0610,Ia84da0b5 into honeycomb-mr1
...
* changes:
UsbManager: Hide APIs not needed for USB host or accessory support.
Remove MtpClient class from framework and public API
UsbDevice: Move IO related methods to new UsbDeviceConnection class
2011-03-11 10:57:06 -08:00
Christopher Tate
d3e53c1884
am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
...
* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
Broaden the filter for wallpaper restore
2011-03-11 10:48:46 -08:00
Christopher Tate
6fc20b07d7
Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1
2011-03-11 10:45:17 -08:00
Dianne Hackborn
8d4fb33c6b
am 7b076307: Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
...
* commit '7b076307bb1f78d3f5616b7f2f2ad496aa4a33d7':
Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:44:46 -08:00
Dianne Hackborn
c9712bba26
am 492eb33d: Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
...
* commit '492eb33d549afa65e630d2f4886b1bdf3d979d04':
Fix issue #4081756 : Crash when un-stopping applications
2011-03-11 10:44:42 -08:00
Dianne Hackborn
1f8c98d091
Merge "Fix issue #4084124 : Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
2011-03-11 10:39:46 -08:00
Dianne Hackborn
3a9c0a05bb
Merge "Fix issue #4081756 : Crash when un-stopping applications" into honeycomb-mr1
2011-03-11 10:38:52 -08:00
Glenn Kasten
afada75e27
am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
...
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
2011-03-11 08:44:35 -08:00
Glenn Kasten
2ee08a1694
Merge "Bug 3012968 DRM output control" into honeycomb-mr1
2011-03-11 08:43:05 -08:00
Mike Lockwood
ef22134e3b
am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
...
* commit '364903bac6b9bfde694f1c0c5c40b6a2af628408':
Support for USB accessory URIs
2011-03-11 06:02:57 -08:00
Mike Lockwood
1fc8136de0
Merge "Support for USB accessory URIs" into honeycomb-mr1
2011-03-11 05:56:50 -08:00
Jim Miller
860a931587
am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
...
* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]
2011-03-10 23:01:42 -08:00
Jim Miller
21daa912d8
Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1
2011-03-10 22:59:57 -08:00
Justin Ho
7129208ad9
am f1093dfd: Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
...
* commit 'f1093dfd7b15c7f33341a4062987c906c061d65f':
Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF
2011-03-10 22:33:43 -08:00
Justin Ho
d295c2701c
Merge "Updated cellular data indicators with transmission signals AGAIN Bug: #6699FF" into honeycomb-mr1
2011-03-10 22:31:29 -08:00
Justin Ho
500608d2f7
am 57162cdc: Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
...
* commit '57162cdcdeaacc826011f98d0285c6034797f5f3':
Wire up the data activity reporting on wifi icon in status bar.
2011-03-10 22:24:51 -08:00
Justin Ho
bce08aed25
Merge "Wire up the data activity reporting on wifi icon in status bar." into honeycomb-mr1
2011-03-10 22:22:57 -08:00
Adam Powell
2672362aa3
am 5ec35c17: Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
...
* commit '5ec35c172ad0628b7092ab34f962ff2c063905d8':
Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser
2011-03-10 21:43:45 -08:00
Justin Ho
8b6836f800
am dacf0d02: Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
...
* commit 'dacf0d022f1f78e60fffcd8b6b547743cca51c76':
Updated cellular data indicators with transmission signals Bug: #6699FF
2011-03-10 21:41:53 -08:00
Adam Powell
c59d880b61
Merge "Fix bug 4082512 IAE "pointerIndex out of range" while zooming over flashplayer in browser" into honeycomb-mr1
2011-03-10 21:40:38 -08:00
Justin Ho
23fc9022d7
Merge "Updated cellular data indicators with transmission signals Bug: #6699FF" into honeycomb-mr1
2011-03-10 21:39:24 -08:00
Huahui Wu
974b33351e
am 769e132a: Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
...
* commit '769e132ae30b6615353dd6bd7d8779b6ef1b0b31':
b/4080388 Improving the performance of ZoomManager
2011-03-10 21:27:24 -08:00
Huahui Wu
df328a2e04
Merge "b/4080388 Improving the performance of ZoomManager" into honeycomb-mr1
2011-03-10 21:25:47 -08:00
Ken Sumrall
06b72dc76e
am c7fcc507: Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
...
* commit 'c7fcc5076fb2988fba699a2167d19475fd58ed0b':
Teach the framework to use the new android_reboot() function.
2011-03-10 19:27:05 -08:00
Ken Sumrall
45d6471556
Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1
2011-03-10 19:24:42 -08:00
Jamie Gennis
da38c1f186
am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
...
* commit 'b2e606f5f175906ab8c578cb9ba03c728154c50c':
SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:07:57 -08:00
Jamie Gennis
c2cc1b3f97
Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
2011-03-10 18:06:32 -08:00
Mathias Agopian
ca9cbe8fa2
am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
...
* commit 'e90c4998b514f738b3655e55b51a38119b8c5f23':
fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:37:47 -08:00
Mathias Agopian
069160eba0
Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1
2011-03-10 17:36:15 -08:00
Teng-Hui Zhu
7b45a5b73a
am 2fc79763: Merge "Inline HTML5 Video support" into honeycomb-mr1
...
* commit '2fc7976399e5f0f4c6e1dae528df727e7dcbdc8e':
Inline HTML5 Video support
2011-03-10 17:13:03 -08:00
Teng-Hui Zhu
40ce089c12
Merge "Inline HTML5 Video support" into honeycomb-mr1
2011-03-10 17:10:29 -08:00
Adam Powell
4bbbdba6b3
am cf63b66c: Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
...
* commit 'cf63b66cfd49dda473806a3b001db72fca48af5a':
Fix bug 4080407 - Browser stuck after scrolling- page stops responding
2011-03-10 17:07:52 -08:00
Adam Powell
672f2f2b66
Merge "Fix bug 4080407 - Browser stuck after scrolling- page stops responding" into honeycomb-mr1
2011-03-10 17:06:11 -08:00
Jamie Gennis
7a4d0dfd43
SurfaceFlinger: Respect the PROTECTED gralloc bit.
...
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.
Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
2011-03-10 16:25:48 -08:00
Scott Main
3c041ed2ff
am dc8b70ca: am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'dc8b70cabc23316e349aaf2fe03bcc830dd66e6c':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:57:38 -08:00
Scott Main
229042cb48
am dd7617b3: am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit 'dd7617b3276c0a666c17ae2fb3ab02d5dce4b354':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:57:34 -08:00
Xia Wang
af268fff07
am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
...
* commit 'cf994cc57df33121cea7a0082c8ea55ca125279c':
Add WifiStressTest to Wi-Fi only test suite.
2011-03-10 15:57:27 -08:00
Scott Main
3b4f8b2ca5
am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
...
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
2011-03-10 15:40:32 -08:00
Scott Main
0b01fccb6d
am 0722cec0: Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
...
* commit '0722cec0f1e921a1d12d3c0dbb8b135d309b2031':
docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300
2011-03-10 15:40:23 -08:00
Xia Wang
416132888b
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1
2011-03-10 15:29:12 -08:00
Scott Main
e3fd9b8044
Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb
2011-03-10 15:17:42 -08:00
Scott Main
ffb7903b47
Merge "docs: fix error in common tasks code snippet and add redirects to all faq docs from /guide to docs in /resources bug:3475300" into honeycomb
2011-03-10 15:13:49 -08:00
Rajneesh Chowdury
ba0f2a3467
am a7118e33: Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
...
* commit 'a7118e33b494b26bfbd37c895a1c412cd5da56ec':
Fix for 4080402 NPE in Transition.setDuration
2011-03-10 15:12:34 -08:00
Rajneesh Chowdury
85df20657a
Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1
2011-03-10 15:10:39 -08:00
Xia Wang
e37f468ed4
resolved conflicts for merge of 16cbe575 to honeycomb-mr1
...
Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0
2011-03-10 15:09:46 -08:00
Eric Fischer
29b37fc799
am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'ff25b975052ddf0e74627cccca742cddd1c8e2f2':
Import revised translations. DO NOT MERGE
2011-03-10 14:47:57 -08:00