Dianne Hackborn
32005bd7c6
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
2011-03-30 17:43:17 -07:00
Justin Ho
cf98fbf9ce
Merge "Replacing browser playback controls for inactive videos Bug: 4136024" into honeycomb-mr1
2011-03-30 15:57:42 -07:00
Trevor Johns
25844ed7ea
am eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
...
* commit 'eb344a69fa728c010425fb1e18fc8f5774693986':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
2011-03-30 15:26:38 -07:00
Andreas Huber
b08b9e8ef5
Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
2011-03-30 15:16:36 -07:00
Eric Fischer
5cdc24e380
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-30 14:39:25 -07:00
Scott Main
d3f76e9527
Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
2011-03-30 12:10:13 -07:00
Andreas Huber
afb643d62c
Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
2011-03-30 09:12:04 -07:00
Mike Lockwood
9870439c00
Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
2011-03-29 22:14:27 -07:00
Eric Fischer
270c1a567d
am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
Import revised translations. DO NOT MERGE
2011-03-29 14:07:14 -07:00
Amith Yamasani
e509e5e805
Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
2011-03-29 13:55:19 -07:00
Eric Fischer
e138d6753f
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-03-29 13:45:03 -07:00
Eric Fischer
09f54780c0
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-29 12:16:53 -07:00
Bill Gruber
aea82d0332
am faede250: IAB doc update for final launch
...
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
IAB doc update for final launch
2011-03-28 23:48:34 -07:00
Mike Lockwood
00aace4934
Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
2011-03-28 10:58:03 -07:00
Andreas Huber
1689095fc5
Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1
2011-03-28 08:11:26 -07:00
Dirk Dougherty
f0da05a075
am 085baa2c: Doc change: Fix scale on highlights screen shots.
...
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
Doc change: Fix scale on highlights screen shots.
2011-03-25 19:22:55 -07:00
Andreas Huber
8c46bc35a6
Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
2011-03-25 15:33:58 -07:00
James Dong
c613ed429e
Merge "Switch to use SF cached source" into honeycomb-mr1
2011-03-25 10:22:57 -07:00
Gloria Wang
9111ab8d91
Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
2011-03-25 10:01:37 -07:00
Scott Main
39ced64baa
am 4045e6b9: docs: a11y doc typo
...
* commit '4045e6b9ab296436cb5344f3af7184c2ce2a8ff0':
docs: a11y doc typo
2011-03-24 14:00:47 -07:00
Scott Main
2accd81522
am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit 'e0b3f2a788e63a10b0fa21bdd700fbcf7e1add34':
docs: fix a few things in a11y doc
2011-03-24 12:26:58 -07:00
Scott Main
1ba7e63c5b
am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit 'b7cfa72932fbb3c794c6e5509b4a5b716236f558':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:51:50 -07:00
Scott Main
94a11356ca
Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
2011-03-24 10:49:59 -07:00
Gloria Wang
0d7705ebbe
Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
2011-03-24 10:40:26 -07:00
Bill Gruber
71a3126787
am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit 'e002734dd2b330ff6f964eeccaf3c6c6207dd9bf':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 10:30:30 -07:00
Bill Gruber
bc10d42b04
Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
2011-03-24 10:26:20 -07:00
Teng-Hui Zhu
9e80b03cc9
Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
2011-03-23 17:32:43 -07:00
Glenn Kasten
2f73ec16ab
Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
2011-03-23 17:03:46 -07:00
Teng-Hui Zhu
b9dcb41dd5
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
2011-03-23 16:03:04 -07:00
shailendra
3f9e2b7a45
Merge "Fix for Media Server memory leak" into honeycomb-mr1
2011-03-23 15:33:51 -07:00
Bill Gruber
812183d7fd
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
2011-03-23 14:58:31 -07:00
Scott Main
4a70ce4ab2
am ef6b305b: docs: fix markup error
...
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
docs: fix markup error
2011-03-23 14:32:44 -07:00
Scott Main
66e284eab4
am fb340563: docs: add Asus driver link to oem driver page
...
* commit 'fb340563e81f93bc179e51bffc846ac03ff02609':
docs: add Asus driver link to oem driver page
2011-03-23 10:25:00 -07:00
Robert Greenwalt
3d41159231
Merge "Fix adding of default route." into honeycomb-mr1
2011-03-22 21:36:04 -07:00
Eric Rowe
a48f738d96
Merge "Clean up BT stress tests." into honeycomb-mr1
2011-03-22 18:57:27 -07:00
Eric Fischer
3e8b4373f1
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
ae01e99c1a
Merge "fix for pause when loading" into honeycomb-mr1
2011-03-22 13:55:28 -07:00
Dianne Hackborn
38475e7294
Merge "Now have a final API 12." into honeycomb-mr1
2011-03-22 12:58:00 -07:00
shailendra
6e7b75f517
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
2011-03-22 11:48:12 -07:00
Gloria Wang
cbd0c8a74f
Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
2011-03-22 11:04:32 -07:00
Andreas Huber
2a15f0fb93
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
2011-03-22 08:37:58 -07:00
Teng-Hui Zhu
0cccea1543
Merge "Fix a crash" into honeycomb-mr1
2011-03-21 18:09:57 -07:00
Yu Shan Emily Lau
10399b194f
Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
2011-03-21 17:32:17 -07:00
Gloria Wang
838c9844f7
Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
2011-03-21 17:26:03 -07:00
Justin Ho
6967dd8e24
Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1
2011-03-21 16:52:35 -07:00
Teng-Hui Zhu
0953e89934
Merge "Support loading image and paused image for inline video" into honeycomb-mr1
2011-03-21 14:01:10 -07:00
Mike Lockwood
731d1353d3
Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
2011-03-20 17:08:24 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
