OSDN Git Service
Jaikumar Ganesh [Wed, 19 Jan 2011 23:28:33 +0000 (15:28 -0800)]
am
baba2475: am
7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
* commit '
baba247578c88b39ec6d83150f7992862c6d05c1':
Make connection / disconnect failure more robust.
Andreas Huber [Wed, 19 Jan 2011 23:28:29 +0000 (15:28 -0800)]
am
559da2fd: am
3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
* commit '
559da2fd899dcd88ccea3f7df31a27b41d6ca074':
Prefill the cache before trying to instantiate the media extractor.
Jaikumar Ganesh [Wed, 19 Jan 2011 23:24:33 +0000 (15:24 -0800)]
am
7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
* commit '
7457b36b92490daa6cd7e346919fad74a4b92eb9':
Make connection / disconnect failure more robust.
Andreas Huber [Wed, 19 Jan 2011 23:24:28 +0000 (15:24 -0800)]
am
3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
* commit '
3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
Prefill the cache before trying to instantiate the media extractor.
Brad Fitzpatrick [Wed, 19 Jan 2011 23:24:02 +0000 (15:24 -0800)]
am
bd80a12c: resolved conflicts for merge of
9240f16d to honeycomb-plus-aosp
* commit '
bd80a12cba480a0dbb2e9073f35c758d8b396b94':
StrictMode: class instance limits (track object "leaks")
Brad Fitzpatrick [Wed, 19 Jan 2011 23:19:08 +0000 (15:19 -0800)]
resolved conflicts for merge of
9240f16d to honeycomb-plus-aosp
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
Jaikumar Ganesh [Wed, 19 Jan 2011 23:13:37 +0000 (15:13 -0800)]
Merge "Make connection / disconnect failure more robust." into honeycomb
Andreas Huber [Wed, 19 Jan 2011 23:12:41 +0000 (15:12 -0800)]
Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
Brad Fitzpatrick [Wed, 19 Jan 2011 22:53:24 +0000 (14:53 -0800)]
Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb
Carl Shapiro [Wed, 19 Jan 2011 22:45:34 +0000 (14:45 -0800)]
am
82ce9e02: am
b098f735: Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
* commit '
82ce9e02ecd076971160d0b9503cde9b286e4dd3':
Add a property for specifying a dalvik heap growth limit.
Carl Shapiro [Wed, 19 Jan 2011 22:42:07 +0000 (14:42 -0800)]
am
b098f735: Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
* commit '
b098f73556ae31f505782d2fe7028b83d1564147':
Add a property for specifying a dalvik heap growth limit.
Romain Guy [Wed, 19 Jan 2011 22:41:29 +0000 (14:41 -0800)]
am
1aae1c2a: am
8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #
3369888" into honeycomb
* commit '
1aae1c2a9ba7ad229e8c2ba8ad1befc598986e57':
Don't attempt to create empty layers. Bug #
3369888
Carl Shapiro [Wed, 19 Jan 2011 22:40:24 +0000 (14:40 -0800)]
Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
Romain Guy [Wed, 19 Jan 2011 22:38:04 +0000 (14:38 -0800)]
am
8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #
3369888" into honeycomb
* commit '
8f36bedcf3fd3b5b3e5746af689b9915d506365f':
Don't attempt to create empty layers. Bug #
3369888
Romain Guy [Wed, 19 Jan 2011 22:36:22 +0000 (14:36 -0800)]
Merge "Don't attempt to create empty layers. Bug #
3369888" into honeycomb
Gil Dobjanschi [Wed, 19 Jan 2011 22:15:08 +0000 (14:15 -0800)]
am
fc8ea8ec: am
c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
* commit '
fc8ea8ecb408b553c2646b904078c672bf78b343':
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
Gil Dobjanschi [Wed, 19 Jan 2011 22:13:41 +0000 (14:13 -0800)]
am
c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
* commit '
c4edeb5a60a45af874474ae7244c921a268430f1':
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
Dharmaray Kundargi [Wed, 19 Jan 2011 22:06:54 +0000 (14:06 -0800)]
am
97619db9: am
fe93351c: Merge "remove eng developement local tags in make file" into honeycomb
* commit '
97619db928777d9ebfecf6c5cbbaf0ea7147a453':
remove eng developement local tags in make file
Dharmaray Kundargi [Wed, 19 Jan 2011 22:04:27 +0000 (14:04 -0800)]
am
fe93351c: Merge "remove eng developement local tags in make file" into honeycomb
* commit '
fe93351cf1e16dcb32c3c824cf4f1201991b2130':
remove eng developement local tags in make file
Shimeng (Simon) Wang [Wed, 19 Jan 2011 22:03:29 +0000 (14:03 -0800)]
am
9656fff3: am
b501f77f: Merge "Use rounded interger to represent the last touch point." into honeycomb
* commit '
9656fff32b20e707e2697b777ad66c1e95a7406c':
Use rounded interger to represent the last touch point.
Dharmaray Kundargi [Wed, 19 Jan 2011 22:02:12 +0000 (14:02 -0800)]
Merge "remove eng developement local tags in make file" into honeycomb
James Dong [Wed, 19 Jan 2011 22:01:18 +0000 (14:01 -0800)]
am
aa474aa6: am
fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
* commit '
aa474aa6f9857272c5f74a14d8ab026ae8fc55c3':
Logging the duration range from different media tracks for recording
Shimeng (Simon) Wang [Wed, 19 Jan 2011 22:01:10 +0000 (14:01 -0800)]
am
b501f77f: Merge "Use rounded interger to represent the last touch point." into honeycomb
* commit '
b501f77f1f2cdcfa9b190f33285a2b3a10e782a9':
Use rounded interger to represent the last touch point.
James Dong [Wed, 19 Jan 2011 21:59:02 +0000 (13:59 -0800)]
am
fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
* commit '
fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287':
Logging the duration range from different media tracks for recording
Shimeng (Simon) Wang [Wed, 19 Jan 2011 21:58:57 +0000 (13:58 -0800)]
Merge "Use rounded interger to represent the last touch point." into honeycomb
James Dong [Wed, 19 Jan 2011 21:57:06 +0000 (13:57 -0800)]
Merge "Logging the duration range from different media tracks for recording" into honeycomb
Christopher Tate [Wed, 19 Jan 2011 21:55:55 +0000 (13:55 -0800)]
am
714066d8: am
5383d077: Merge "Fix a couple of drag & drop crashes" into honeycomb
* commit '
714066d873b70098c09c2c094d374781b12d65a2':
Fix a couple of drag & drop crashes
Christopher Tate [Wed, 19 Jan 2011 21:53:42 +0000 (13:53 -0800)]
am
5383d077: Merge "Fix a couple of drag & drop crashes" into honeycomb
* commit '
5383d077ed79e9fec95361046fcd7491ee9a0fd4':
Fix a couple of drag & drop crashes
Christopher Tate [Wed, 19 Jan 2011 21:51:58 +0000 (13:51 -0800)]
Merge "Fix a couple of drag & drop crashes" into honeycomb
Romain Guy [Wed, 19 Jan 2011 21:44:36 +0000 (13:44 -0800)]
am
2c197a07: am
9335f5b2: Merge "Make embedded hardware layers work. Bug #
3369474" into honeycomb
* commit '
2c197a0708dc3cb26c335371b572a3c47ca33736':
Make embedded hardware layers work. Bug #
3369474
Romain Guy [Wed, 19 Jan 2011 21:42:33 +0000 (13:42 -0800)]
am
9335f5b2: Merge "Make embedded hardware layers work. Bug #
3369474" into honeycomb
* commit '
9335f5b2fde244614184f45d29cc574d1ba8cbba':
Make embedded hardware layers work. Bug #
3369474
Romain Guy [Wed, 19 Jan 2011 21:40:43 +0000 (13:40 -0800)]
Merge "Make embedded hardware layers work. Bug #
3369474" into honeycomb
Derek Sollenberger [Wed, 19 Jan 2011 21:25:51 +0000 (13:25 -0800)]
am
c8937d84: am
aa2275e3: Fix complex character support for plugins.
* commit '
c8937d8452542688ade144a8fc715088cec84f11':
Fix complex character support for plugins.
Derek Sollenberger [Wed, 19 Jan 2011 21:23:20 +0000 (13:23 -0800)]
am
aa2275e3: Fix complex character support for plugins.
* commit '
aa2275e31d1ab6d672013e82a7b8da2559b0e085':
Fix complex character support for plugins.
Svetoslav Ganov [Wed, 19 Jan 2011 20:39:56 +0000 (12:39 -0800)]
am
1ebd8c11: am
4243dc39: Updated the Time/Date pickers to be backwards compatible
* commit '
1ebd8c11f73625050035b4fca35841a9e30bca04':
Updated the Time/Date pickers to be backwards compatible
Svetoslav Ganov [Wed, 19 Jan 2011 20:37:36 +0000 (12:37 -0800)]
am
4243dc39: Updated the Time/Date pickers to be backwards compatible
* commit '
4243dc394d89a93cb207efa36e9755c2424d688b':
Updated the Time/Date pickers to be backwards compatible
Shih-wei Liao [Wed, 19 Jan 2011 20:26:28 +0000 (12:26 -0800)]
am
371fd707: am
9f7e83b4: Merge "c99 bool support" into honeycomb
* commit '
371fd7071d803c9ba2eb35e6df38df8258e9ca5b':
c99 bool support
Shih-wei Liao [Wed, 19 Jan 2011 20:24:01 +0000 (12:24 -0800)]
am
9f7e83b4: Merge "c99 bool support" into honeycomb
* commit '
9f7e83b4062beba5b3ce7d3693505ec082f7d3f6':
c99 bool support
Eric Laurent [Wed, 19 Jan 2011 20:22:13 +0000 (12:22 -0800)]
am
28e8c942: am
10f4ffe9: Merge "Issue
3315999: catch ToneGenerator exceptions." into honeycomb
* commit '
28e8c9423c1e8ac8f5d945f6f7742511e58dac57':
Issue
3315999: catch ToneGenerator exceptions.
Shih-wei Liao [Wed, 19 Jan 2011 20:21:55 +0000 (12:21 -0800)]
Merge "c99 bool support" into honeycomb
Eric Laurent [Wed, 19 Jan 2011 20:19:51 +0000 (12:19 -0800)]
am
10f4ffe9: Merge "Issue
3315999: catch ToneGenerator exceptions." into honeycomb
* commit '
10f4ffe9619ca3a943e3460d8bb7b5441575a173':
Issue
3315999: catch ToneGenerator exceptions.
Eric Laurent [Wed, 19 Jan 2011 20:18:10 +0000 (12:18 -0800)]
Merge "Issue
3315999: catch ToneGenerator exceptions." into honeycomb
Costin Manolache [Wed, 19 Jan 2011 20:05:35 +0000 (12:05 -0800)]
am
de2964ec: am
f5ffe89e: Token cache was not reset on password change
* commit '
de2964ec0aeeda5a280f724b82c2de5700369629':
Token cache was not reset on password change
Costin Manolache [Wed, 19 Jan 2011 20:03:26 +0000 (12:03 -0800)]
am
f5ffe89e: Token cache was not reset on password change
* commit '
f5ffe89e736caee1419f0acb469565d5100b8fb8':
Token cache was not reset on password change
Romain Guy [Wed, 19 Jan 2011 20:03:21 +0000 (12:03 -0800)]
am
cdc2f68a: am
34829553: Merge "Fix the fix for 9patches." into honeycomb
* commit '
cdc2f68a4a786745629a9daa2c7ee9b44bc8de73':
Fix the fix for 9patches.
Romain Guy [Wed, 19 Jan 2011 20:01:20 +0000 (12:01 -0800)]
am
34829553: Merge "Fix the fix for 9patches." into honeycomb
* commit '
34829553a803d37ae3555579f4aa130e652644d9':
Fix the fix for 9patches.
Andreas Huber [Wed, 19 Jan 2011 20:01:13 +0000 (12:01 -0800)]
am
4026ea7c: am
0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
* commit '
4026ea7c25089e88a49920035b937ab95ed47029':
Always revert to the previous bandwidth if the required sequence number cannot be found
Andreas Huber [Wed, 19 Jan 2011 19:59:14 +0000 (11:59 -0800)]
am
0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
* commit '
0353459d405e20750b3ddd8abad83eace1ed2a39':
Always revert to the previous bandwidth if the required sequence number cannot be found
Romain Guy [Wed, 19 Jan 2011 19:58:21 +0000 (11:58 -0800)]
Merge "Fix the fix for 9patches." into honeycomb
Andreas Huber [Wed, 19 Jan 2011 19:56:15 +0000 (11:56 -0800)]
Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
James Dong [Wed, 19 Jan 2011 19:54:59 +0000 (11:54 -0800)]
am
89433929: am
4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb
* commit '
894339298ec7e8a6b47bf949d4b242289f241103':
Turn error/exception logging on at the native layer
James Dong [Wed, 19 Jan 2011 19:52:56 +0000 (11:52 -0800)]
am
4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb
* commit '
4f28901f2a15f566a98bf5d14ac510e05401f960':
Turn error/exception logging on at the native layer
Adam Cohen [Wed, 19 Jan 2011 19:51:42 +0000 (11:51 -0800)]
am
9f97174b: am
c446ae83: Merge "Removing deprecated widget api method." into honeycomb
* commit '
9f97174b9b5048b6ea2f9c8cf9e99df76185f4c4':
Removing deprecated widget api method.
James Dong [Wed, 19 Jan 2011 19:50:16 +0000 (11:50 -0800)]
Merge "Turn error/exception logging on at the native layer" into honeycomb
Adam Cohen [Wed, 19 Jan 2011 19:49:44 +0000 (11:49 -0800)]
am
c446ae83: Merge "Removing deprecated widget api method." into honeycomb
* commit '
c446ae83e08fb451589dbacba9aa3f89d0d6acb0':
Removing deprecated widget api method.
Adam Cohen [Wed, 19 Jan 2011 19:47:56 +0000 (11:47 -0800)]
Merge "Removing deprecated widget api method." into honeycomb
Irfan Sheriff [Wed, 19 Jan 2011 19:44:22 +0000 (11:44 -0800)]
am
6387174c: am
7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
* commit '
6387174c41cb97f82106be9922a619ab1324980a':
Fix soft Ap handling on system restart
Irfan Sheriff [Wed, 19 Jan 2011 19:42:35 +0000 (11:42 -0800)]
am
7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
* commit '
7a97ad421b50208dc2f484cc23fa3bb29331a713':
Fix soft Ap handling on system restart
Irfan Sheriff [Wed, 19 Jan 2011 19:40:01 +0000 (11:40 -0800)]
Merge "Fix soft Ap handling on system restart" into honeycomb
Romain Guy [Wed, 19 Jan 2011 19:38:52 +0000 (11:38 -0800)]
am
4ca3ee26: am
c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
* commit '
4ca3ee261d71ba56a9636655c27d6d038392b746':
Don't let toasts "leak" Context instances.
Romain Guy [Wed, 19 Jan 2011 19:36:10 +0000 (11:36 -0800)]
am
c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
* commit '
c7816cd6a1441cd46af57224c616c2d56ced5105':
Don't let toasts "leak" Context instances.
Andreas Huber [Wed, 19 Jan 2011 19:35:38 +0000 (11:35 -0800)]
am
ee48eaba: am
71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
* commit '
ee48eabab8c32104eb04e2abb6f6212b94f32211':
Return a runtime error if decryption fails instead of asserting.
Andreas Huber [Wed, 19 Jan 2011 19:33:56 +0000 (11:33 -0800)]
am
71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
* commit '
71bb6a2a3eb668fe7459cd8fff1f65a15804c3be':
Return a runtime error if decryption fails instead of asserting.
Romain Guy [Wed, 19 Jan 2011 19:33:43 +0000 (11:33 -0800)]
Merge "Don't let toasts "leak" Context instances." into honeycomb
Andreas Huber [Wed, 19 Jan 2011 19:31:44 +0000 (11:31 -0800)]
Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
Dianne Hackborn [Wed, 19 Jan 2011 19:20:01 +0000 (11:20 -0800)]
am
92ce4f6a: am
7666ebd9: Merge "Bee seeing you..." into honeycomb
* commit '
92ce4f6afcfce9db08c8c8468bc732eeab3cd7c2':
Bee seeing you...
Dianne Hackborn [Wed, 19 Jan 2011 19:18:12 +0000 (11:18 -0800)]
am
7666ebd9: Merge "Bee seeing you..." into honeycomb
* commit '
7666ebd9f29df718f57354e0317db2ccbe6369b0':
Bee seeing you...
Dianne Hackborn [Wed, 19 Jan 2011 19:16:38 +0000 (11:16 -0800)]
Merge "Bee seeing you..." into honeycomb
Mike Lockwood [Wed, 19 Jan 2011 18:44:32 +0000 (10:44 -0800)]
am
da3bb70a: am
54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
* commit '
da3bb70a1f9240766d60bffa039d26e6378f2a6c':
Environment.isExternalStorageRemovable() is false if external storage is emulated
Mike Lockwood [Wed, 19 Jan 2011 18:42:31 +0000 (10:42 -0800)]
am
54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
* commit '
54973710d769e4722dc21778f8fcb7b08d2872dd':
Environment.isExternalStorageRemovable() is false if external storage is emulated
Andreas Huber [Wed, 19 Jan 2011 18:42:15 +0000 (10:42 -0800)]
am
8da1ca52: am
069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
* commit '
8da1ca52808f81f41919e118c3667b794ee31f6b':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
Mike Lockwood [Wed, 19 Jan 2011 18:40:56 +0000 (10:40 -0800)]
Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
Andreas Huber [Wed, 19 Jan 2011 18:40:19 +0000 (10:40 -0800)]
am
069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
* commit '
069ee21a2012e0b6fd355253ea81a84ea11138d2':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
Romain Guy [Wed, 19 Jan 2011 18:40:09 +0000 (10:40 -0800)]
am
9941311a: am
49903d26: Merge "Fix 9patches in Launcher" into honeycomb
* commit '
9941311a5be06b82f6a5de21695dbae0b0c979f0':
Fix 9patches in Launcher
Andreas Huber [Wed, 19 Jan 2011 18:38:16 +0000 (10:38 -0800)]
Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
Romain Guy [Wed, 19 Jan 2011 18:38:15 +0000 (10:38 -0800)]
am
49903d26: Merge "Fix 9patches in Launcher" into honeycomb
* commit '
49903d265be787885619e017edcc42604005f6b0':
Fix 9patches in Launcher
Romain Guy [Wed, 19 Jan 2011 18:35:46 +0000 (10:35 -0800)]
Merge "Fix 9patches in Launcher" into honeycomb
James Dong [Wed, 19 Jan 2011 18:32:58 +0000 (10:32 -0800)]
am
6df89f2e: am
8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
* commit '
6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
Expose average video frame rate via MPEG4Extractor
James Dong [Wed, 19 Jan 2011 18:31:06 +0000 (10:31 -0800)]
am
8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
* commit '
8e7d626385eef104d52aa9080b70395ca840a0cd':
Expose average video frame rate via MPEG4Extractor
James Dong [Wed, 19 Jan 2011 18:29:04 +0000 (10:29 -0800)]
Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
Leon Scroggins [Wed, 19 Jan 2011 18:28:32 +0000 (10:28 -0800)]
am
60964579: am
b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
* commit '
60964579fe9c56bfac21a91dbb2355b1086e47b6':
Only scroll on screen when necessary.
Mike Lockwood [Wed, 19 Jan 2011 18:26:30 +0000 (10:26 -0800)]
am
216a7b97: am
dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
* commit '
216a7b97ebedc6886d98a117fcfe0b83891e5e45':
MTP: Close and reopen driver file after an error.
Leon Scroggins [Wed, 19 Jan 2011 18:25:52 +0000 (10:25 -0800)]
am
b90bd293: Merge "Only scroll on screen when necessary." into honeycomb
* commit '
b90bd293c2a8f2bb68f5cbd63966ea1739814e7d':
Only scroll on screen when necessary.
Leon Scroggins [Wed, 19 Jan 2011 18:23:52 +0000 (10:23 -0800)]
Merge "Only scroll on screen when necessary." into honeycomb
Mike Lockwood [Wed, 19 Jan 2011 18:23:44 +0000 (10:23 -0800)]
am
dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb
* commit '
dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
MTP: Close and reopen driver file after an error.
Mike Lockwood [Wed, 19 Jan 2011 18:20:38 +0000 (10:20 -0800)]
Merge "MTP: Close and reopen driver file after an error." into honeycomb
James Dong [Wed, 19 Jan 2011 18:09:01 +0000 (10:09 -0800)]
am
1324e3b1: am
4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '
1324e3b1a4246f77d516b37fa98013ffad91268e':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
James Dong [Wed, 19 Jan 2011 18:06:23 +0000 (10:06 -0800)]
am
4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '
4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
James Dong [Wed, 19 Jan 2011 18:05:05 +0000 (10:05 -0800)]
Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
Andreas Huber [Wed, 19 Jan 2011 17:53:30 +0000 (09:53 -0800)]
am
d3bf3eea: am
2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
* commit '
d3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
Turn another assertion into a runtime error. Damn you surfaces.
Andreas Huber [Wed, 19 Jan 2011 17:51:42 +0000 (09:51 -0800)]
am
2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
* commit '
2597aedb3869e46f945359c529e03263c77a944d':
Turn another assertion into a runtime error. Damn you surfaces.
Andreas Huber [Wed, 19 Jan 2011 17:49:32 +0000 (09:49 -0800)]
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
Eric Laurent [Wed, 19 Jan 2011 17:46:03 +0000 (09:46 -0800)]
am
42ac3249: am
42466b1c: Merge "Tentative fix for issue
3362362." into honeycomb
* commit '
42ac32498aea67a43f666946c4b77a376f54cfaf':
Tentative fix for issue
3362362.
Eric Laurent [Wed, 19 Jan 2011 17:43:17 +0000 (09:43 -0800)]
am
42466b1c: Merge "Tentative fix for issue
3362362." into honeycomb
* commit '
42466b1cad4cec1aa746809dfcca702456415be4':
Tentative fix for issue
3362362.
Eric Laurent [Wed, 19 Jan 2011 17:40:34 +0000 (09:40 -0800)]
Merge "Tentative fix for issue
3362362." into honeycomb
Robert Greenwalt [Wed, 19 Jan 2011 17:33:48 +0000 (09:33 -0800)]
Merge "Fix Tethering's handling of a system restart."
Jean-Michel Trivi [Wed, 19 Jan 2011 17:17:27 +0000 (09:17 -0800)]
am
3ebe75cc: am
928e48f2: Merge "Fix bug
2084122: enable application control over text synth volume" into honeycomb
* commit '
3ebe75cc51a268b273d63591c3035e03f2b68800':
Fix bug
2084122: enable application control over text synth volume
Jean-Michel Trivi [Wed, 19 Jan 2011 17:14:57 +0000 (09:14 -0800)]
am
928e48f2: Merge "Fix bug
2084122: enable application control over text synth volume" into honeycomb
* commit '
928e48f2bae9816fb5b3f1444f8ca9a4de15d8c3':
Fix bug
2084122: enable application control over text synth volume
Jean-Michel Trivi [Wed, 19 Jan 2011 17:13:04 +0000 (09:13 -0800)]
Merge "Fix bug
2084122: enable application control over text synth volume" into honeycomb
Kristian Monsen [Wed, 19 Jan 2011 16:09:48 +0000 (08:09 -0800)]
am
710d5f45: am
c40fc871: Need to sync the cache settings to native side
* commit '
710d5f4591b6158f9a527e363aa4d589c39e9f71':
Need to sync the cache settings to native side
OSDN Git Service
