OSDN Git Service
Eric Laurent [Wed, 23 Nov 2011 20:35:01 +0000 (12:35 -0800)]
am
f6422f5f: am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:31:04 +0000 (12:31 -0800)]
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
Michael Chan [Wed, 23 Nov 2011 20:16:21 +0000 (12:16 -0800)]
am
a181a919: am
37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '
a181a9197c0affbcddd627c625c8064f494b94d6':
Update description of account_type
Michael Chan [Wed, 23 Nov 2011 20:14:16 +0000 (12:14 -0800)]
am
37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '
37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
Update description of account_type
Michael Chan [Wed, 23 Nov 2011 20:12:51 +0000 (12:12 -0800)]
Merge "Update description of account_type" into ics-mr1
Robert Greenwalt [Wed, 23 Nov 2011 19:29:24 +0000 (11:29 -0800)]
am
18f05518: am
eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '
18f05518a882eeb778433c65bff27831a8accdc2':
Fix some policy-base routing issues.
Robert Greenwalt [Wed, 23 Nov 2011 19:27:06 +0000 (11:27 -0800)]
am
eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '
eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
Fix some policy-base routing issues.
Robert Greenwalt [Wed, 23 Nov 2011 19:25:39 +0000 (11:25 -0800)]
Merge "Fix some policy-base routing issues." into ics-mr1
Owen Lin [Wed, 23 Nov 2011 01:48:49 +0000 (17:48 -0800)]
am
85c38af1: am
8bb56180: Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '
85c38af1d47e288775052cd188e3f014fa40e8a2':
Fix
5654631. It forgot to consider the year in formatDateRange.
Owen Lin [Wed, 23 Nov 2011 01:46:35 +0000 (17:46 -0800)]
am
8bb56180: Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '
8bb56180d208b9264e5a56b49fe06b8471ccaced':
Fix
5654631. It forgot to consider the year in formatDateRange.
Owen Lin [Wed, 23 Nov 2011 01:44:52 +0000 (17:44 -0800)]
Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
James Dong [Wed, 23 Nov 2011 01:36:45 +0000 (17:36 -0800)]
Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
Robert Ly [Wed, 23 Nov 2011 00:21:45 +0000 (16:21 -0800)]
Merge "add overview description for RS API reference"
Jason Sams [Wed, 23 Nov 2011 00:05:48 +0000 (16:05 -0800)]
Merge "Fix script init error handling."
The Android Open Source Project [Tue, 22 Nov 2011 23:29:52 +0000 (15:29 -0800)]
The Android Open Source Project [Tue, 22 Nov 2011 23:26:16 +0000 (15:26 -0800)]
am
1889bb49: Reconcile with ics-mr0-release
* commit '
1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
The Android Open Source Project [Tue, 22 Nov 2011 23:24:03 +0000 (15:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
The Android Open Source Project [Tue, 22 Nov 2011 23:18:08 +0000 (15:18 -0800)]
The Android Open Source Project [Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)]
am
27239099: Reconcile with ics-mr0-release
* commit '
2723909903b68db016666a13ec897581a8915636':
The Android Open Source Project [Tue, 22 Nov 2011 23:15:44 +0000 (15:15 -0800)]
Reconcile with ics-mr0-release
Change-Id: I6367147c460a2e3eb2c13ac3fdb3946ab5fec9d0
The Android Open Source Project [Tue, 22 Nov 2011 23:14:10 +0000 (15:14 -0800)]
Reconcile with ics-mr0-release
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
The Android Automerger [Tue, 22 Nov 2011 22:28:06 +0000 (14:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
dujin.cha [Tue, 22 Nov 2011 21:22:00 +0000 (13:22 -0800)]
am
4d592c59: am
eabde3d4: am
fe464a76: [Prime K] Fix gabage character issue
* commit '
4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
[Prime K] Fix gabage character issue
dujin.cha [Tue, 22 Nov 2011 21:20:09 +0000 (13:20 -0800)]
am
eabde3d4: am
fe464a76: [Prime K] Fix gabage character issue
* commit '
eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
[Prime K] Fix gabage character issue
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:19:58 +0000 (13:19 -0800)]
am
63899f78: (-s ours) am
eff6ed0f: Ignore
e36657e5
* commit '
63899f78729a292e77cab0c9c01fff23b69a1b02':
Do not merge. Fix a memory leak of a Binder in SpellCheckerService
dujin.cha [Tue, 22 Nov 2011 21:18:27 +0000 (13:18 -0800)]
am
fe464a76: [Prime K] Fix gabage character issue
* commit '
fe464a76d8fc858be971dbb5e67b1d22fd925347':
[Prime K] Fix gabage character issue
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:18:05 +0000 (13:18 -0800)]
am
eff6ed0f: Ignore
e36657e5
* commit '
eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
Do not merge. Fix a memory leak of a Binder in SpellCheckerService
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:15:28 +0000 (13:15 -0800)]
Ignore
e36657e5
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
Jeff Brown [Tue, 22 Nov 2011 20:57:08 +0000 (12:57 -0800)]
Merge "Use libcorkscrew to format the stack trace."
Romain Guy [Tue, 22 Nov 2011 20:42:06 +0000 (12:42 -0800)]
am
a2fabf4a: am
303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
* commit '
a2fabf4a109d46f99ff7370aa05e48c1708c2838':
Draw in the correct FBO after invoking a GL functor Bug #
5650514
Romain Guy [Tue, 22 Nov 2011 20:42:04 +0000 (12:42 -0800)]
am
e25ed181: am
26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
* commit '
e25ed181070579fca2522112b1659af2fbf8ddfc':
Ensure we have an EGL context when building layers Bug #
5638421
Amith Yamasani [Tue, 22 Nov 2011 20:41:57 +0000 (12:41 -0800)]
am
d61b61d6: am
227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '
d61b61d6f97f9f73b86e4a24a747c4451f2bc939':
Fix an NPE on overflow in BatteryStats history.
Romain Guy [Tue, 22 Nov 2011 20:35:25 +0000 (12:35 -0800)]
am
303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
* commit '
303a0695b8fa0b8f0095c437145a28633a7a8d92':
Draw in the correct FBO after invoking a GL functor Bug #
5650514
Romain Guy [Tue, 22 Nov 2011 20:35:18 +0000 (12:35 -0800)]
am
26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
* commit '
26dd54f87c1daaa369576d9abea823c8105bd702':
Ensure we have an EGL context when building layers Bug #
5638421
Romain Guy [Tue, 22 Nov 2011 20:33:17 +0000 (12:33 -0800)]
Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 20:33:04 +0000 (12:33 -0800)]
Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:56:20 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Fabrice Di Meglio [Tue, 22 Nov 2011 19:23:49 +0000 (11:23 -0800)]
Merge "Improve TextLayoutCache performances"
Amith Yamasani [Tue, 22 Nov 2011 19:04:58 +0000 (11:04 -0800)]
am
227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '
227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
Fix an NPE on overflow in BatteryStats history.
Amith Yamasani [Tue, 22 Nov 2011 19:02:49 +0000 (11:02 -0800)]
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
Teng-Hui Zhu [Tue, 22 Nov 2011 16:59:36 +0000 (08:59 -0800)]
am
b8ee50ee: am
7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '
b8ee50eece1481110721cb4e93a54c03fbf77d27':
HTML5 Video runs into super full screen mode
Teng-Hui Zhu [Tue, 22 Nov 2011 16:57:02 +0000 (08:57 -0800)]
am
7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '
7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
HTML5 Video runs into super full screen mode
Teng-Hui Zhu [Tue, 22 Nov 2011 16:54:59 +0000 (08:54 -0800)]
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
Andreas Huber [Tue, 22 Nov 2011 16:43:28 +0000 (08:43 -0800)]
am
31626b30: am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
31626b3075335f4cf579342e99436bb45870cf55':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:41:04 +0000 (08:41 -0800)]
am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Daniel Sandler [Tue, 22 Nov 2011 15:19:02 +0000 (07:19 -0800)]
am
70f1279e: am
63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '
70f1279e65eaa138f297a8f590f8383f2c76f7b4':
Dismiss system windows when screen savers start.
Daniel Sandler [Tue, 22 Nov 2011 15:16:47 +0000 (07:16 -0800)]
am
63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '
631885746868cbf03f89e655a6f4fac96449e8a4':
Dismiss system windows when screen savers start.
Daniel Sandler [Tue, 22 Nov 2011 15:15:29 +0000 (07:15 -0800)]
Merge "Dismiss system windows when screen savers start." into ics-mr1
Mangesh Ghiware [Tue, 22 Nov 2011 07:18:04 +0000 (23:18 -0800)]
am
d7b06977: am
8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '
d7b06977e927557923a6101493c0af1aa857271b':
Update zoom (aka display) density from WebView thread.
Mangesh Ghiware [Tue, 22 Nov 2011 07:16:06 +0000 (23:16 -0800)]
am
8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '
8d03007f80d74abadfc96926e7cca40d38380bc0':
Update zoom (aka display) density from WebView thread.
Mangesh Ghiware [Tue, 22 Nov 2011 07:14:05 +0000 (23:14 -0800)]
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
Romain Guy [Tue, 22 Nov 2011 05:23:49 +0000 (21:23 -0800)]
am
ea54d0dc: am
723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit '
ea54d0dc0dfeef5560fea04667804413d522025f':
Hide ManagedEGLContext until we are sure this is the correct API.
Romain Guy [Tue, 22 Nov 2011 05:20:57 +0000 (21:20 -0800)]
am
723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
* commit '
723218b4f428944bdb11b25d0b30ece56283f696':
Hide ManagedEGLContext until we are sure this is the correct API.
Romain Guy [Tue, 22 Nov 2011 05:18:51 +0000 (21:18 -0800)]
Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
James Dong [Tue, 22 Nov 2011 05:08:55 +0000 (21:08 -0800)]
am
d0a25456: am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
d0a254566f5f0be5607b4d64839a575c888c94f6':
Fix log spamming during time lapse video recording
Romain Guy [Tue, 22 Nov 2011 05:08:52 +0000 (21:08 -0800)]
Wu-cheng Li [Tue, 22 Nov 2011 05:08:50 +0000 (21:08 -0800)]
am
a21d5d2c: am
e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
* commit '
a21d5d2c53a37e4f20716cbb5e5d1944b8a3f7df':
Move Camera.Sound to a stand-alone class CameraSound.
Mathias Agopian [Tue, 22 Nov 2011 05:08:47 +0000 (21:08 -0800)]
am
cc4d02e0: am
07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit '
cc4d02e0cbb99341a0508838c88eeef53180fdfd':
don't report an error when disconnecting from an abandoned surfacetexture
Mathias Agopian [Tue, 22 Nov 2011 05:08:44 +0000 (21:08 -0800)]
am
8390cf39: am
8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
8390cf39f8a4f74f7baa91d23cba06894a3fb9b5':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Romain Guy [Tue, 22 Nov 2011 05:08:42 +0000 (21:08 -0800)]
am
c26e4d18: am
8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #
5639899" into ics-mr1
* commit '
c26e4d18a20ab0b3e769fb3e547994f1c27d6713':
Notify views when EGL resources are about to be destroyed Bug #
5639899
Adam Powell [Tue, 22 Nov 2011 05:08:40 +0000 (21:08 -0800)]
am
516035f0: am
fb0784da: Merge "Fix bug
5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
* commit '
516035f0923aad612932327546e780c7c241ceda':
Fix bug
5521467 - Monkeys and ActionBar custom tab views
Nick Pelly [Tue, 22 Nov 2011 05:08:29 +0000 (21:08 -0800)]
am
4fb747f3: am
043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '
4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Jamie Gennis [Tue, 22 Nov 2011 05:08:23 +0000 (21:08 -0800)]
am
8b8c321c: am
b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
* commit '
8b8c321c70687ace750e42b745b6e96258d739cd':
EGL: Use cache sizes defined in the BoardConfig
Jamie Gennis [Tue, 22 Nov 2011 05:08:21 +0000 (21:08 -0800)]
am
c2597295: am
53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit '
c25972950c2ea62fb085524dbe737c2bf0f08f4a':
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
Eric Fischer [Tue, 22 Nov 2011 05:08:20 +0000 (21:08 -0800)]
am
281d1072: (-s ours) am
68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
281d1072b4d880f70016d4553c7fcc25c00c89d3':
Import revised translations. DO NOT MERGE
Chia-chi Yeh [Tue, 22 Nov 2011 05:07:56 +0000 (21:07 -0800)]
am
0e67685e: am
bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
* commit '
0e67685e53cbcf7682a0364cf34fd3ac0632596f':
SIP: turn off verbose logs.
John Reck [Tue, 22 Nov 2011 05:07:33 +0000 (21:07 -0800)]
am
786513ab: am
0507ac4d: Use isHighEndGfx to determine texture pool
* commit '
786513aba608d958e69deee3fbdf003bdf5d9632':
Use isHighEndGfx to determine texture pool
Jeff Brown [Tue, 22 Nov 2011 05:04:55 +0000 (21:04 -0800)]
Use libcorkscrew to format the stack trace.
Change-Id: I3a5439ada76bc77c2dd491eaed2272e16a811cc7
James Dong [Tue, 22 Nov 2011 04:29:59 +0000 (20:29 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
James Dong [Tue, 22 Nov 2011 04:28:27 +0000 (20:28 -0800)]
Merge "Fix log spamming during time lapse video recording" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 02:31:29 +0000 (18:31 -0800)]
Wu-cheng Li [Tue, 22 Nov 2011 02:13:06 +0000 (18:13 -0800)]
am
e7005ec9: Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
* commit '
e7005ec9582f11744fa74d9c5c9562f9e4be04dc':
Move Camera.Sound to a stand-alone class CameraSound.
Wu-cheng Li [Tue, 22 Nov 2011 02:10:52 +0000 (18:10 -0800)]
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 02:00:52 +0000 (18:00 -0800)]
am
07a2d831: Merge "don\'t report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
* commit '
07a2d831903774e07c1c6b6dd5c7c06bf8ca176a':
don't report an error when disconnecting from an abandoned surfacetexture
Mathias Agopian [Tue, 22 Nov 2011 01:58:42 +0000 (17:58 -0800)]
am
8646cd42: Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
* commit '
8646cd42df5edc5f5b9c52d6ab5309821e875656':
enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices
Romain Guy [Tue, 22 Nov 2011 01:58:40 +0000 (17:58 -0800)]
am
8cd39e3a: Merge "Notify views when EGL resources are about to be destroyed Bug #
5639899" into ics-mr1
* commit '
8cd39e3a104d0739fd2f1ae73e5f4081f1528c6c':
Notify views when EGL resources are about to be destroyed Bug #
5639899
Mathias Agopian [Tue, 22 Nov 2011 01:57:31 +0000 (17:57 -0800)]
Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
Mathias Agopian [Tue, 22 Nov 2011 01:57:20 +0000 (17:57 -0800)]
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 01:57:05 +0000 (17:57 -0800)]
Merge "Notify views when EGL resources are about to be destroyed Bug #
5639899" into ics-mr1
Adam Powell [Tue, 22 Nov 2011 01:36:20 +0000 (17:36 -0800)]
am
fb0784da: Merge "Fix bug
5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
* commit '
fb0784da5f602bf6410ef914d625c3cedfa11e9f':
Fix bug
5521467 - Monkeys and ActionBar custom tab views
Adam Powell [Tue, 22 Nov 2011 01:34:57 +0000 (17:34 -0800)]
Merge "Fix bug
5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
Nick Pelly [Tue, 22 Nov 2011 01:31:45 +0000 (17:31 -0800)]
Merge "Throw a nicer error message when using an invalid context to create Nfc"
satok [Tue, 22 Nov 2011 00:30:07 +0000 (16:30 -0800)]
Merge "add sentence level spell checker hidden apis"
Nick Pelly [Tue, 22 Nov 2011 00:05:30 +0000 (16:05 -0800)]
am
043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '
043a8b149dc31d3e3242ccf0cadc580702c99552':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Nick Pelly [Tue, 22 Nov 2011 00:03:40 +0000 (16:03 -0800)]
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
Jamie Gennis [Mon, 21 Nov 2011 23:56:12 +0000 (15:56 -0800)]
am
b8d20d02: Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
* commit '
b8d20d028ca590f6a9c57e0e8fee5e5f80e9ae54':
EGL: Use cache sizes defined in the BoardConfig
Jamie Gennis [Mon, 21 Nov 2011 23:56:11 +0000 (15:56 -0800)]
am
53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit '
53cf20202a3848a6c61b5229814268180a3d2f16':
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
Jamie Gennis [Mon, 21 Nov 2011 23:54:54 +0000 (15:54 -0800)]
Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
Jamie Gennis [Mon, 21 Nov 2011 23:54:40 +0000 (15:54 -0800)]
Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* changes:
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
Jeff Brown [Mon, 21 Nov 2011 23:40:22 +0000 (15:40 -0800)]
Merge "Change desk dock to use accelerometer by default."
Eric Fischer [Mon, 21 Nov 2011 23:31:36 +0000 (15:31 -0800)]
am
68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
68f0d47e8ee045dffb5f59c67cc77f38598472c5':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:29:06 +0000 (15:29 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Chia-chi Yeh [Mon, 21 Nov 2011 23:22:00 +0000 (15:22 -0800)]
am
bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1
* commit '
bfd85f9aca13aba2b954ddf3d8c6f6eb26e35f25':
SIP: turn off verbose logs.
Chia-chi Yeh [Mon, 21 Nov 2011 23:19:35 +0000 (15:19 -0800)]
Merge "SIP: turn off verbose logs." into ics-mr1
Jamie Gennis [Sun, 20 Nov 2011 05:20:17 +0000 (21:20 -0800)]
SurfaceTexture: fix a couple tests
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests. The tests previously
depended upon GL implementation details that should not have been relied
upon.
Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
Jamie Gennis [Sun, 20 Nov 2011 02:04:43 +0000 (18:04 -0800)]
EGL: default to swap interval 1
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.
Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
Irfan Sheriff [Mon, 21 Nov 2011 22:34:47 +0000 (14:34 -0800)]
Merge "Add support for infinite dhcp lease time"