Stephen Hines
a48439d58b
Merge "Revert "Fix cleanup bug clearing script references.""
2011-03-24 12:00:09 -07:00
Adam Powell
64599cf94b
Merge "Fix bug 4136071 - CAB causes the action bar to be shown, regardless of previous state"
2011-03-24 11:16:13 -07:00
Romain Guy
f6087c2404
Merge "Use the correct API to query system properties."
2011-03-23 19:57:23 -07:00
Romain Guy
828c85a3c5
am e28f8351: (-s ours) am ee061921: am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'e28f83519a447b9f49a218d0b337e3921db24b39':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:35:36 -07:00
Romain Guy
4e72c1c2b1
am ee061921: am b5fa4909: DO NOT MERGE Take fake bold font property into account. Bug #4159731
...
* commit 'ee0619214934a6828b810f2e8a108bd461736ea9':
DO NOT MERGE Take fake bold font property into account. Bug #4159731
2011-03-23 19:33:54 -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
2bd3e68743
am 842b914f: am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit '842b914f26633aa94f3c63fbfc6a6b521904e1b8':
When the video is not on the front, it should be paused
2011-03-23 17:38:28 -07:00
Teng-Hui Zhu
f064666e4f
am a7605d3b: am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit 'a7605d3b2ec9526fc369e5e0a1a37880db2c0694':
When the video is not on the front, it should be paused
2011-03-23 17:36:03 -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
Iliyan Malchev
e1a8c619ce
Merge "retire android_native_window_t"
2011-03-23 17:19:28 -07:00
Romain Guy
345aa73012
Merge "Don't crash when omitting paint to drawBitmap() with A8 configs."
2011-03-23 17:19:24 -07:00
Eric Hassold
b14009c758
Merge "Check for initialized EGLDisplay when required by specification"
2011-03-23 17:13:58 -07:00
Glenn Kasten
1e470ae2ae
am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:09:55 -07:00
Glenn Kasten
cc2d2fe37e
am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1
...
* commit '503f4daf0113579e111d371dbfb6824cc8c311f1':
Bug 4159373 Use HDCP debug settings
2011-03-23 17:07:54 -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
Romain Guy
781676ea7e
Merge "Fix shaders generation on IMG GPUs."
2011-03-23 16:57:35 -07:00
Romain Guy
fe3ecd3bb6
Merge "Apply color filters to bitmaps."
2011-03-23 16:56:18 -07:00
Iliyan Malchev
5cfbdc87d6
retire android_native_window_t
...
Change-Id: I232c526168e1a93977d1c2d0fa74c8937cdeb23b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-23 16:43:20 -07:00
Teng-Hui Zhu
98eac4d717
am fee1d146: am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit 'fee1d146a3285e887712150496bbf002f4945079':
Make sure the full screen playing continue when timeout
2011-03-23 16:09:46 -07:00
Wink Saville
eb194f0de1
am 50e17002: am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
...
* commit '50e1700247fbb552f7b2837915e6752fe609258e':
Fix NPE in CatService.encodeOptionalTags.
2011-03-23 16:09:43 -07:00
Teng-Hui Zhu
db5c4f03d1
am 50373509: am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit '503735099d51e9701be4737dff4e74b35361d371':
Make sure the full screen playing continue when timeout
2011-03-23 16:07:57 -07:00
Wink Saville
1002167c34
am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE
...
* commit '464b2259c9c70b36c534e8f2380ff45130a84c66':
Fix NPE in CatService.encodeOptionalTags.
2011-03-23 16:07:54 -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
shailendra
1e8041c224
am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
Fix for Media Server memory leak
2011-03-23 16: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
Bill Gruber
ec633e0343
am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
...
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 16:00:30 -07:00
Eric Hassold
3ede7c133a
Check for initialized EGLDisplay when required by specification
...
Check for initialized display, and set EGL error to EGL_NOT_INITIALIZED
whenever it isn't, for all EGL functions taking an EGLDisplay as argument
and requiring it to have been initialized.
Bug: 3366011
Change-Id: Ib1d8a3a207257995518f4430fe97f8c406c7fc13
2011-03-23 15:59:00 -07:00
shailendra
f0cbc91a61
am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
...
* commit 'a450ef06689b44415a3bbbfb4aaad082189eb7ad':
Fix for Media Server memory leak
2011-03-23 15:53:25 -07:00
Bill Gruber
61891e1702
am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
...
* commit '3bde4594d5794645b5f7e0ff1bf9c4a0b44161b1':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
2011-03-23 15:51:23 -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
Romain Guy
b490597b53
Merge "Take fake bold font property into account. Bug #4159731 "
2011-03-23 15:00:24 -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
1ff4b06f0c
am 8346a6c2: am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit '8346a6c27311afdce4755807a23a8edcf1f52f66':
docs: fix markup error
2011-03-23 14:49:38 -07:00
Scott Main
88c266e765
am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit 'ee7cfaf28969998ca15800f99bcdab2596051865':
docs: fix markup error
2011-03-23 14:47:34 -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
Simon Wilson
bafa9964f8
am d4f4fb98: (-s ours) am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit 'd4f4fb98ed4c3d0e36a0a873390914007863135a':
DO NOT MERGE Change WiMAX indicator display
2011-03-23 14:11:31 -07:00
Simon Wilson
f1b714e3a2
am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread
...
* commit '03aa986e6b19e436c71801d2e5af6f44521a94ab':
DO NOT MERGE Change WiMAX indicator display
2011-03-23 14:06:16 -07:00
repo sync
e89af8bbb0
am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp
...
* commit 'd5ba9c22236346578ce34e3e8b475b8cad9773dd':
remove the code that clears the passwords when the sim is replaced with a different one.
2011-03-23 13:49:35 -07:00
repo sync
84aeb79def
Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-03-23 13:46:32 -07:00
Chet Haase
ed6649ec97
Merge "Add custom fragment anims to be run when popping backstack"
2011-03-23 11:25:09 -07:00
Fabrice Di Meglio
549937540f
Merge "Use Harfbuzz instead of ICU4C for computing advances"
2011-03-23 10:56:41 -07:00
Scott Main
205b7e9c25
am bfc10795: am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
...
* commit 'bfc10795f21383b6d48aff3476ceeb79cdfce194':
docs: add Asus driver link to oem driver page
2011-03-23 10:45:03 -07:00
Scott Main
a0ab9eb96f
am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page
...
* commit '01b649aa3ac9a8c1d2aff03f51e66438092d0691':
docs: add Asus driver link to oem driver page
2011-03-23 10:38:02 -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