Teng-Hui Zhu
4fd8d4cbce
am 7af7e00b: Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
...
* commit '7af7e00b9112f15d1683ae93975a6fcd9dd34da8':
Support html5 video switching b/t full screen and inline mode
2011-03-16 23:03:04 -07:00
Teng-Hui Zhu
d5b7248aed
Merge "Support html5 video switching b/t full screen and inline mode" into honeycomb-mr1
2011-03-16 23:01:03 -07:00
Bart Sears
0c457ee474
am 8e42d39f: Merge "partial inval" into honeycomb-mr1
...
* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
partial inval
2011-03-16 21:50:52 -07:00
Bart Sears
b5ff32a575
Merge "partial inval" into honeycomb-mr1
2011-03-16 21:49:09 -07:00
Alex Sakhartchouk
1165479006
am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1
...
* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
Fix for bug 3434228
2011-03-16 21:18:37 -07:00
Alex Sakhartchouk
a320dedae7
Merge "Fix for bug 3434228" into honeycomb-mr1
2011-03-16 21:16:31 -07:00
Adam Cohen
cfe73d165a
am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:03:23 -07:00
Adam Cohen
e330f4b40e
Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
2011-03-16 18:02:08 -07:00
Romain Guy
8311f4202c
am c2b91a61: Merge "Modify the GL renderer\'s functor to pass the clip to WebView" into honeycomb-mr1
...
* commit 'c2b91a6113c30d3b994ef081fbd5b941200d55a4':
Modify the GL renderer's functor to pass the clip to WebView
2011-03-16 17:26:41 -07:00
Romain Guy
a0f38d2785
Merge "Modify the GL renderer's functor to pass the clip to WebView" into honeycomb-mr1
2011-03-16 17:24:32 -07:00
Eric Fischer
3ed2e9b1e5
am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
2011-03-16 17:10:09 -07:00
Yu Shan Emily Lau
cf033b3f26
am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
...
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
b5c21a3a3b
Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
2011-03-16 16:40:46 -07:00
Rajneesh Chowdury
8e384bd92d
am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
...
* commit '0edefea88e975613bca9f0227614de91434ade11':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:05:54 -07:00
Rajneesh Chowdury
aeb686df2e
Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
2011-03-16 16:03:15 -07:00
Mathias Agopian
bbcff6af79
am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
...
* commit 'af831a7bd5f1a3ffd1129f5f15b862c5973d48b6':
fix [4107131] nvidia driver call takes a very long time
2011-03-16 15:59:15 -07:00
Mathias Agopian
da155b248b
Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1
2011-03-16 15:57:57 -07:00
Romain Guy
a08152f43c
Modify the GL renderer's functor to pass the clip to WebView
...
Change-Id: If5efe399ca58f3000b2883e24e9f3736a2025184
2011-03-16 15:31:33 -07:00
James Dong
ab375862e9
am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
...
* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
2011-03-16 15:11:03 -07:00
James Dong
fa064b9933
Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
2011-03-16 15:09:21 -07:00
Shimeng (Simon) Wang
acdd032f0f
am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit '464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Mathias Agopian
36bdf14a75
fix [4107131] nvidia driver call takes a very long time
...
We were leaking all EGLSyncKHR objects, over time the list
would grow and become very slow to operate on.
Bug: 4107131
Change-Id: I6c82daf49fe3189d04550781d64d57c30c95f552
2011-03-16 14:19:03 -07:00
Michael Kolb
a440dbdd11
am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Andreas Huber
db6b1d7dcf
am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
...
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
2011-03-16 13:18:42 -07:00
Michael Kolb
d52a4c4ac0
Merge "add comment to deprecated tag" into honeycomb-mr1
2011-03-16 13:10:48 -07:00
Andreas Huber
ecdbccea55
Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
2011-03-16 13:06:52 -07:00
Mike Lockwood
e011307d8f
am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
...
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
USB System UI: Improve message for the "no app for USB accessory" dialog.
2011-03-16 12:06:58 -07:00
Mike Lockwood
b80cf4bdf6
Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1
2011-03-16 12:03:39 -07:00
Michael Kolb
464e14e801
am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
5d05f431dd
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
2011-03-16 11:33:13 -07:00
Eric Fischer
4459711aaf
am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
f5ff29ae49
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:23:02 -07:00
Mike Lockwood
4dd078cd35
am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
...
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
USB System UI: Fix string localization problems
2011-03-16 04:33:29 -07:00
Mike Lockwood
923325fe00
Merge "USB System UI: Fix string localization problems" into honeycomb-mr1
2011-03-16 04:31:15 -07:00
Eric Laurent
ed61c95282
am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
...
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
Improvement for issue 3489986: BT SCO volume
2011-03-15 23:44:43 -07:00
Romain Guy
82bf71ea7a
am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
...
* commit '46fc25171af8bbaf4594946ce406a667ce2ec27a':
Fix performance issue in Launcher Bug #3515248
2011-03-15 23:44:30 -07:00
Justin Ho
c83eb9fcaa
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:44:12 -07:00
Justin Ho
d7ae58202b
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '141505a9769099ac38eacb62409a75ff891860a1':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Stephen Hines
ca92c2196b
am 2d5cbc92: Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
...
* commit '2d5cbc92add5065a62acdd38cd254eebb1ee2f94':
2X2 matrix needs 4 float elements.
2011-03-15 23:43:55 -07:00
Eric Fischer
e0ee4cce0b
am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
Import revised translations. DO NOT MERGE
2011-03-15 23:29:10 -07:00
Justin Ho
4f635d4b93
am 9b183a72: Merge "Updated notification asset for DND mode" into honeycomb-mr1
...
* commit '9b183a72bcaab75897d1571d55ecbaf228ed4abd':
Updated notification asset for DND mode
2011-03-15 21:37:27 -07:00
Eric Laurent
d54d83636e
Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
2011-03-15 19:17:53 -07:00
Romain Guy
f8fc4132c1
Merge "Fix performance issue in Launcher Bug #3515248 " into honeycomb-mr1
2011-03-15 18:23:48 -07:00
Justin Ho
0d88d2b5c7
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:52:07 -07:00
Justin Ho
fbd578454e
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:47:27 -07:00
Stephen Hines
f38ea534a7
Merge "2X2 matrix needs 4 float elements." into honeycomb-mr1
2011-03-15 16:22:19 -07:00
Eric Fischer
d97acec4b8
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:59:33 -07:00
Justin Ho
26d44cbae3
Merge "Updated notification asset for DND mode" into honeycomb-mr1
2011-03-15 14:41:30 -07:00
Kenny Root
98755be6ed
am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:03:50 -07:00
Kenny Root
85f811bd47
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:01:39 -07:00