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
c56993bd05
am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
...
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
2011-03-30 09:27:14 -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
80c12241b1
am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -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
Wink Saville
2e7c89b84a
Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
2011-03-29 14:44:56 -07:00
Eric Fischer
2ffee604fa
am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
2011-03-29 14:15:22 -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
533b7eb13c
am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
...
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:06:29 -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
b358e1c9e4
am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
Import revised translations. DO NOT MERGE
2011-03-29 12:20:42 -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
e170d21bce
am e4f33617: am faede250: IAB doc update for final launch
...
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
IAB doc update for final launch
2011-03-29 00:00:37 -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
Wink Saville
7e0531e7ab
Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
2011-03-28 12:11:42 -07:00
Mike Lockwood
dcc1d18101
am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
...
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -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
9de7d2bb83
am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
...
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -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
Wink Saville
dd767313f9
Merge "Work around for operator not being correct." into honeycomb-LTE
2011-03-26 16:50:17 -07:00
Wink Saville
bbeec2416e
Merge "Add some debug to apn list creation routines." into honeycomb-LTE
2011-03-26 16:48:35 -07:00
Dirk Dougherty
16b0d813eb
am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots.
...
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
Doc change: Fix scale on highlights screen shots.
2011-03-25 19:25:45 -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
636a44a11a
am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1
...
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
Make sure we post a video event when seeking after seeing video EOS before.
2011-03-25 15:38:34 -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
Adam Powell
c99c6d3544
am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
...
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:45:06 -07:00
James Dong
f518993012
am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1
...
* commit '837430dd3440f6e71f68ef755399e22386dee084':
Switch to use SF cached source
2011-03-25 10:24:44 -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
3c2c14bad9
am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
...
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
2011-03-25 10:05:50 -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
2a6b3af87b
am cc4b6a61: am 4045e6b9: docs: a11y doc typo
...
* commit 'cc4b6a61c6df67c211ac85d49f457fd562abf142':
docs: a11y doc typo
2011-03-24 14:11:39 -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
96fcbb6431
am 119e79cf: am e0b3f2a7: docs: fix a few things in a11y doc
...
* commit '119e79cf2763592389b4543612400d746bb9aeb2':
docs: fix a few things in a11y doc
2011-03-24 12:29:24 -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
22bb60049e
am 95cb883c: am b7cfa729: Merge "docs: add document for accessibility, authored by Cheryl Simon (clsimon)" into honeycomb
...
* commit '95cb883c066b754a96c899b48bd487e2ad0f213d':
docs: add document for accessibility, authored by Cheryl Simon (clsimon)
2011-03-24 10:54:08 -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
d8776379e7
am e2cd3353: 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
...
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
2011-03-24 10:42:14 -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
12596d4568
am 6efa3599: am e002734d: Merge "IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948" into honeycomb
...
* commit '6efa3599590d3c75a648c3d93353011eb8e30278':
IAB doc updates for final launch plus bug fixes Bug: 3491550 Bug: 3491426 Bug: 3407948
2011-03-24 10:33:53 -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
Romain Guy
850a8f3465
am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'b5fa490995dff116b8a6fdc274bee6f6db4d0d0c':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:31:38 -07:00
Teng-Hui Zhu
915cc451dd
am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
When the video is not on the front, it should be paused
2011-03-23 17:34:15 -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
414ceb5c33
am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:06:12 -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
df9c06019e
am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
Make sure the full screen playing continue when timeout
2011-03-23 16:06:10 -07:00
Wink Saville
997033d920
Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
2011-03-23 16:05:52 -07:00