Commit Graph

31807 Commits

Author SHA1 Message Date
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
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
1e367b31e7 am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
  Fix for Media Server memory leak
2011-03-23 15:47:47 -07:00
Bill Gruber
fc6f9fd085 am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 15:43:09 -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
afff7413da am 18cd686f: am ef6b305b: docs: fix markup error
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
2011-03-23 14:43:35 -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
424297ae99 am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
* commit '7d02efa1029435dfa3a4a9f8449ee1cbda543730':
  docs: add Asus driver link to oem driver page
2011-03-23 10:33:49 -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
352d2f647f am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
3d41159231 Merge "Fix adding of default route." into honeycomb-mr1 2011-03-22 21:36:04 -07:00
Eric Rowe
11381a9fa3 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
2011-03-22 18:59:00 -07:00
Eric Rowe
a48f738d96 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Wink Saville
ebbb2704e0 Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -07:00
Wink Saville
70fd41bf35 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Eric Fischer
e0b5cead10 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
2011-03-22 13:59:20 -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
632de2d17f am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
2011-03-22 13:56:35 -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
594b57954b am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
2011-03-22 13:01:19 -07:00
Dianne Hackborn
38475e7294 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
shailendra
5096f083b6 am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:50:15 -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
79ee4c6b6e am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
2011-03-22 11:06:43 -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
bb76e23360 am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
2011-03-22 08:48:58 -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