OSDN Git Service
Elliott Hughes [Wed, 19 Jan 2011 06:00:14 +0000 (22:00 -0800)]
am
b28c5ecc: am
ea6a3c70: Merge "Minor updates." into honeycomb
* commit '
b28c5eccabff5192d94fd59594123e8f9d450c1c':
Minor updates.
Adam Powell [Wed, 19 Jan 2011 06:00:06 +0000 (22:00 -0800)]
am
eb7a7a04: am
6cfc7a0a: Merge "Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
* commit '
eb7a7a044adba95216152e848fa692ec2869e06b':
Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing
Mathias Agopian [Wed, 19 Jan 2011 05:59:58 +0000 (21:59 -0800)]
am
246bd60e: am
fc14d42b: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
* commit '
246bd60efa89376918e5d4cd53d2ed4f9288bf8d':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails
Christopher Tate [Wed, 19 Jan 2011 05:58:32 +0000 (21:58 -0800)]
am
31cd02ad: am
17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '
31cd02ade3dd85c676bb278a1c2181f57179c390':
API CHANGE: add a no-View ctor for DragShadowBuilder
Romain Guy [Wed, 19 Jan 2011 05:58:24 +0000 (21:58 -0800)]
am
069f9b63: am
745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
* commit '
069f9b6352951134a8c0b3d5320e31290e681206':
Smoother pinch-zoom in Browser.
Jack Palevich [Wed, 19 Jan 2011 05:58:11 +0000 (21:58 -0800)]
am
79f74eda: am
a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit '
79f74eda8a6ba96519bb3a084f656fcacb1cd2e7':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
John Reck [Wed, 19 Jan 2011 05:58:01 +0000 (21:58 -0800)]
am
733e2047: am
c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
* commit '
733e2047e7dbb53d5b3b2514bfb76edbcef8a149':
Create db path if it doesn't exit
Nick Pelly [Wed, 19 Jan 2011 05:57:31 +0000 (21:57 -0800)]
am
b6b426ad: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
* commit '
b6b426ad1c953555dd6393844c29be5c9a9cd700':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
Andreas Huber [Wed, 19 Jan 2011 05:57:06 +0000 (21:57 -0800)]
am
f9846fcd: am
39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
* commit '
f9846fcdf89432d05c713a5f356a0bd1447d3cf1':
Apparently our native TCP sockets do not return an error from blocking "connect"
Dianne Hackborn [Wed, 19 Jan 2011 05:56:45 +0000 (21:56 -0800)]
am
2ec5a716: am
36c84403: Merge "Fix issue #
3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
* commit '
2ec5a7160b3d32887b2428edef7a751ee3700809':
Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog
Jeff Brown [Wed, 19 Jan 2011 05:56:31 +0000 (21:56 -0800)]
am
761a6b7f: am
f4368c95: Merge "Filter virtual keys after touches." into honeycomb
* commit '
761a6b7fdbe2bcc6db4306af9705dcb22b036068':
Filter virtual keys after touches.
Eric Fischer [Wed, 19 Jan 2011 05:55:34 +0000 (21:55 -0800)]
am
18a7428d: (-s ours) am
2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
18a7428dcb7cd3008d2c898efaaf8fe20604fdf3':
Import revised translations. DO NOT MERGE
James Dong [Wed, 19 Jan 2011 05:54:39 +0000 (21:54 -0800)]
am
d2225a06: am
1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
* commit '
d2225a06a315db9988236dcf5c5bca743f6d457d':
Fix the sluggish preview during timelapse video recording because software encoder is used.
Costin Manolache [Wed, 19 Jan 2011 05:54:17 +0000 (21:54 -0800)]
am
bf8e1627: am
b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
* commit '
bf8e162702d0e56a8f5bf97de4c40b0a87fd78a4':
Add back NEW_TASK flag.
Stephen Hines [Wed, 19 Jan 2011 05:54:03 +0000 (21:54 -0800)]
am
780816b3: am
0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb
* commit '
780816b306876ad3e82fa5181f5d77a44720c497':
Validate that version pragma is correct.
Eric Laurent [Wed, 19 Jan 2011 05:53:48 +0000 (21:53 -0800)]
am
2d1362b7: am
74ff70d2: Merge "Fix typo" into honeycomb
* commit '
2d1362b7b4c090157878212edfddba282f831502':
Fix typo
Kenny Root [Wed, 19 Jan 2011 05:53:21 +0000 (21:53 -0800)]
am
67f23166: am
11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
* commit '
67f23166d00d0b965d5b913bcc0cfb442c0e9506':
Erase OBB files when removing packages
Romain Guy [Wed, 19 Jan 2011 05:53:07 +0000 (21:53 -0800)]
am
4a809367: am
553889a6: Merge "Fix 9patches, again... Bug #
3365243" into honeycomb
* commit '
4a80936778b1e20f063df89869f089444f46797f':
Fix 9patches, again... Bug #
3365243
Mike Lockwood [Wed, 19 Jan 2011 05:52:18 +0000 (21:52 -0800)]
am
14032e3b: am
5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb
* commit '
14032e3b3e9b5f31d7dd1264a8d0c79e2bc633e7':
MTP: Set modification date for abstract playlists
Brad Fitzpatrick [Wed, 19 Jan 2011 05:52:05 +0000 (21:52 -0800)]
am
fe384670: am
3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
* commit '
fe3846707b7fbe86681e49e88c9368213f0eb16a':
Fixing memory leak in PreferenceScreen.
James Dong [Wed, 19 Jan 2011 05:51:52 +0000 (21:51 -0800)]
am
1b67fec7: am
0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb
* commit '
1b67fec7e16860d6f605f810ae422375ec3a567d':
Fix the build break in git_master-without-vendor
Mike Lockwood [Wed, 19 Jan 2011 05:51:17 +0000 (21:51 -0800)]
am
b5f08714: am
26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
* commit '
b5f08714597c7a50388336480a6b72f3dc698735':
MTP: Strip ".pla" file extension from name field for WMP playlists
Kenny Root [Wed, 19 Jan 2011 05:51:04 +0000 (21:51 -0800)]
am
189854d0: am
241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb
* commit '
189854d0735eae7b251d39360c9582cbcbb0a642':
Don't cache return of getService in Environment
Brad Fitzpatrick [Wed, 19 Jan 2011 05:50:45 +0000 (21:50 -0800)]
am
7adf8481: am
b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
* commit '
7adf848183b39ac4d0b8b67435ace94909ca3076':
StrictMode class instance limit interface.
Romain Guy [Wed, 19 Jan 2011 05:50:19 +0000 (21:50 -0800)]
am
a7d666ab: am
713440d2: Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #
3360888" into honeycomb
* commit '
a7d666ab59cab888a07065099226023745486ba2':
Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #
3360888
Jack Palevich [Wed, 19 Jan 2011 05:50:06 +0000 (21:50 -0800)]
am
3ee50921: am
b54407f2: Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
* commit '
3ee50921957a00a91a951707aeff83208d293f2f':
Add support for preserving EGL contexts when pausing / resuming.
Andreas Huber [Wed, 19 Jan 2011 04:44:04 +0000 (20:44 -0800)]
am
63e99c39: am
529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
* commit '
63e99c39e1e1a0dd7989bb858447b3ca76738554':
Implement parsing of vbv buffering info in RTSP.
John Wang [Wed, 19 Jan 2011 04:43:41 +0000 (20:43 -0800)]
am
ae451252: am
8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
* commit '
ae451252f425525efd4ade9adbd023a00a89c3e7':
Enable AUTO_TIME_ZONE settings.
Bryan Mawhinney [Wed, 19 Jan 2011 04:43:22 +0000 (20:43 -0800)]
am
6d7d0da9: am
3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb
* commit '
6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b':
Don't report 100% buffered when the stream ends prematurely.
Elliott Hughes [Wed, 19 Jan 2011 02:39:36 +0000 (18:39 -0800)]
am
ea6a3c70: Merge "Minor updates." into honeycomb
* commit '
ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
Minor updates.
Adam Powell [Wed, 19 Jan 2011 02:39:10 +0000 (18:39 -0800)]
am
6cfc7a0a: Merge "Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
* commit '
6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590':
Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing
Mathias Agopian [Wed, 19 Jan 2011 02:39:02 +0000 (18:39 -0800)]
am
fc14d42b: Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
* commit '
fc14d42b75d25b5062613333331839c895621f3b':
fix [
3361121] hang in glClear() - device unresponsive, OTA fails
Christopher Tate [Wed, 19 Jan 2011 02:36:06 +0000 (18:36 -0800)]
am
17ed60c3: API CHANGE: add a no-View ctor for DragShadowBuilder
* commit '
17ed60c3d2e480ab9788b445958a22b9ae7b6e96':
API CHANGE: add a no-View ctor for DragShadowBuilder
Romain Guy [Wed, 19 Jan 2011 02:35:50 +0000 (18:35 -0800)]
am
745a5292: Merge "Smoother pinch-zoom in Browser." into honeycomb
* commit '
745a529249c346656a404e38333f6d0ce6503fd7':
Smoother pinch-zoom in Browser.
Jack Palevich [Wed, 19 Jan 2011 02:35:42 +0000 (18:35 -0800)]
am
a228e4f8: Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
* commit '
a228e4f833b96e0633571735c2363e30363e155c':
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
John Reck [Wed, 19 Jan 2011 02:35:35 +0000 (18:35 -0800)]
am
c098c1d3: Merge "Create db path if it doesn\'t exit" into honeycomb
* commit '
c098c1d348a183635561c504ccd67a9014a45475':
Create db path if it doesn't exit
Elliott Hughes [Wed, 19 Jan 2011 01:25:05 +0000 (17:25 -0800)]
Merge "Minor updates." into honeycomb
Adam Powell [Wed, 19 Jan 2011 00:57:59 +0000 (16:57 -0800)]
Merge "Fix bug
3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
Mathias Agopian [Wed, 19 Jan 2011 00:52:33 +0000 (16:52 -0800)]
Merge "fix [
3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
Nick Pelly [Wed, 19 Jan 2011 00:10:48 +0000 (16:10 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into honeycomb-plus-aosp
Gloria Wang [Wed, 19 Jan 2011 00:09:44 +0000 (16:09 -0800)]
Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"
Romain Guy [Tue, 18 Jan 2011 23:55:31 +0000 (15:55 -0800)]
Merge "Smoother pinch-zoom in Browser." into honeycomb
Jack Palevich [Tue, 18 Jan 2011 23:54:29 +0000 (15:54 -0800)]
Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
John Reck [Tue, 18 Jan 2011 23:53:33 +0000 (15:53 -0800)]
Merge "Create db path if it doesn't exit" into honeycomb
Mathias Agopian [Tue, 18 Jan 2011 23:51:30 +0000 (15:51 -0800)]
fix [
3361121] hang in glClear() - device unresponsive, OTA fails
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
Change-Id: I1f226b1ebdf6918439b687c2723955d55b842c55
Andreas Huber [Tue, 18 Jan 2011 23:37:58 +0000 (15:37 -0800)]
am
39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
* commit '
39560507215774873ba64b5f0ff61648488924ea':
Apparently our native TCP sockets do not return an error from blocking "connect"
Andreas Huber [Tue, 18 Jan 2011 23:35:35 +0000 (15:35 -0800)]
Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
Dianne Hackborn [Tue, 18 Jan 2011 23:32:44 +0000 (15:32 -0800)]
am
36c84403: Merge "Fix issue #
3362484: Can\'t dismiss activity picker by tapping outside dialog" into honeycomb
* commit '
36c84403ec07439d11ed284ac5f9a9db807fbf92':
Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog
Dianne Hackborn [Tue, 18 Jan 2011 23:31:21 +0000 (15:31 -0800)]
Merge "Fix issue #
3362484: Can't dismiss activity picker by tapping outside dialog" into honeycomb
Jeff Brown [Tue, 18 Jan 2011 23:29:28 +0000 (15:29 -0800)]
am
f4368c95: Merge "Filter virtual keys after touches." into honeycomb
* commit '
f4368c959fa9436d75feb2543cb65da0d46521e5':
Filter virtual keys after touches.
Jeff Brown [Tue, 18 Jan 2011 23:26:15 +0000 (15:26 -0800)]
Merge "Filter virtual keys after touches." into honeycomb
Eric Fischer [Tue, 18 Jan 2011 23:16:59 +0000 (15:16 -0800)]
am
2c0d22e7: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
2c0d22e72c0e3fa1705e39eeaedfdbad89a785ce':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Jan 2011 23:13:06 +0000 (15:13 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
James Dong [Tue, 18 Jan 2011 22:44:58 +0000 (14:44 -0800)]
am
1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
* commit '
1418de7eff012c37cf34328eb368a547d70a1441':
Fix the sluggish preview during timelapse video recording because software encoder is used.
James Dong [Tue, 18 Jan 2011 22:43:02 +0000 (14:43 -0800)]
Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
Costin Manolache [Tue, 18 Jan 2011 22:39:44 +0000 (14:39 -0800)]
am
b8b671df: Merge "Add back NEW_TASK flag." into honeycomb
* commit '
b8b671df4778d98d00267566ed129f734bbe13a3':
Add back NEW_TASK flag.
Costin Manolache [Tue, 18 Jan 2011 22:37:24 +0000 (14:37 -0800)]
Merge "Add back NEW_TASK flag." into honeycomb
Stephen Hines [Tue, 18 Jan 2011 22:29:23 +0000 (14:29 -0800)]
am
0e5f4e54: Merge "Validate that version pragma is correct." into honeycomb
* commit '
0e5f4e549bec3bf998e1db3af47ccb353c31ff63':
Validate that version pragma is correct.
Eric Laurent [Tue, 18 Jan 2011 22:27:17 +0000 (14:27 -0800)]
am
74ff70d2: Merge "Fix typo" into honeycomb
* commit '
74ff70d2f2e90c591c58723121bc26ab44a3adcc':
Fix typo
Stephen Hines [Tue, 18 Jan 2011 22:26:24 +0000 (14:26 -0800)]
Merge "Validate that version pragma is correct." into honeycomb
Eric Laurent [Tue, 18 Jan 2011 22:25:17 +0000 (14:25 -0800)]
Merge "Fix typo" into honeycomb
Kenny Root [Tue, 18 Jan 2011 22:05:02 +0000 (14:05 -0800)]
am
11ebdd6a: Merge "Erase OBB files when removing packages" into honeycomb
* commit '
11ebdd6a7991283986c4fb94ec5f0774cc11d6da':
Erase OBB files when removing packages
Kenny Root [Tue, 18 Jan 2011 22:03:15 +0000 (14:03 -0800)]
Merge "Erase OBB files when removing packages" into honeycomb
Romain Guy [Tue, 18 Jan 2011 22:02:58 +0000 (14:02 -0800)]
am
553889a6: Merge "Fix 9patches, again... Bug #
3365243" into honeycomb
* commit '
553889a678c9bb2d67aaf5fc52b4585e8cebd6ab':
Fix 9patches, again... Bug #
3365243
Romain Guy [Tue, 18 Jan 2011 22:00:28 +0000 (14:00 -0800)]
Merge "Fix 9patches, again... Bug #
3365243" into honeycomb
James Dong [Tue, 18 Jan 2011 21:40:06 +0000 (13:40 -0800)]
Merge "Fix the build break in git_master-without-vendor"
Mike Lockwood [Tue, 18 Jan 2011 21:32:12 +0000 (13:32 -0800)]
am
5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb
* commit '
5f31aa30cdf104dc10c2a503d7846178d6aa79cb':
MTP: Set modification date for abstract playlists
Mike Lockwood [Tue, 18 Jan 2011 21:29:55 +0000 (13:29 -0800)]
Merge "MTP: Set modification date for abstract playlists" into honeycomb
Brad Fitzpatrick [Tue, 18 Jan 2011 21:28:56 +0000 (13:28 -0800)]
am
3ab249cc: Merge "Fixing memory leak in PreferenceScreen." into honeycomb
* commit '
3ab249cc32b2b94b8d4fcb2775e5b97285c48623':
Fixing memory leak in PreferenceScreen.
James Dong [Tue, 18 Jan 2011 21:28:47 +0000 (13:28 -0800)]
am
0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb
* commit '
0a3dbf6f69a72d557afca69f006a407fbfc2482d':
Fix the build break in git_master-without-vendor
Brad Fitzpatrick [Tue, 18 Jan 2011 21:26:56 +0000 (13:26 -0800)]
Merge "Fixing memory leak in PreferenceScreen." into honeycomb
James Dong [Tue, 18 Jan 2011 21:26:14 +0000 (13:26 -0800)]
Merge "Fix the build break in git_master-without-vendor" into honeycomb
Mike Lockwood [Tue, 18 Jan 2011 21:17:27 +0000 (13:17 -0800)]
am
26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
* commit '
26c1ab2e58f47ac94e638f69b9b626cc6b1925b6':
MTP: Strip ".pla" file extension from name field for WMP playlists
Kenny Root [Tue, 18 Jan 2011 21:15:18 +0000 (13:15 -0800)]
am
241fc72b: Merge "Don\'t cache return of getService in Environment" into honeycomb
* commit '
241fc72b455158849c623c0819c9d71a2e6e7ae4':
Don't cache return of getService in Environment
Mike Lockwood [Tue, 18 Jan 2011 21:14:58 +0000 (13:14 -0800)]
Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
Brad Fitzpatrick [Tue, 18 Jan 2011 21:13:07 +0000 (13:13 -0800)]
am
b4f655d5: Merge "StrictMode class instance limit interface." into honeycomb
* commit '
b4f655d5912869078cb7be29d108ebfea06019fc':
StrictMode class instance limit interface.
Kenny Root [Tue, 18 Jan 2011 21:12:55 +0000 (13:12 -0800)]
Merge "Don't cache return of getService in Environment" into honeycomb
Brad Fitzpatrick [Tue, 18 Jan 2011 21:11:33 +0000 (13:11 -0800)]
Merge "StrictMode class instance limit interface." into honeycomb
Romain Guy [Tue, 18 Jan 2011 21:02:09 +0000 (13:02 -0800)]
am
713440d2: Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #
3360888" into honeycomb
* commit '
713440d2ef959e76ab2d22dde5f1430da6fa8f90':
Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #
3360888
Jack Palevich [Tue, 18 Jan 2011 21:02:03 +0000 (13:02 -0800)]
am
b54407f2: Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
* commit '
b54407f2bbc616d60291ad7bc659aed7f148cb26':
Add support for preserving EGL contexts when pausing / resuming.
Romain Guy [Tue, 18 Jan 2011 21:00:41 +0000 (13:00 -0800)]
Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #
3360888" into honeycomb
Jack Palevich [Tue, 18 Jan 2011 21:00:27 +0000 (13:00 -0800)]
Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
Romain Guy [Tue, 18 Jan 2011 20:23:54 +0000 (12:23 -0800)]
am
a2dcab45: am
89108d5c: Merge "Add support for skew()" into honeycomb
* commit '
a2dcab45d8dbbd9fd8d93720a91f789f18ae4d76':
Add support for skew()
Dianne Hackborn [Tue, 18 Jan 2011 20:10:36 +0000 (12:10 -0800)]
am
f6759102: am
3aa959b9: Merge "Fix issue #
3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
* commit '
f67591025debf040695e9ed0d0edeff5ef0c5db2':
Fix issue #
3362666 Activities launched from ongoing notifications don't animate
Mike Lockwood [Tue, 18 Jan 2011 20:10:31 +0000 (12:10 -0800)]
am
f9828f65: am
0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
* commit '
f9828f6584ddbab9aab3abdbc47ef355651e7bfb':
MTP: Fix problems with modification dates for folders and non-media files
John Reck [Tue, 18 Jan 2011 20:10:22 +0000 (12:10 -0800)]
am
3977afe4: am
d00207ff: Merge "WebStorage public API change" into honeycomb
* commit '
3977afe41679290fedbe661e53dcf360136f52d0':
WebStorage public API change
David Turner [Tue, 18 Jan 2011 20:10:17 +0000 (12:10 -0800)]
am
adec2de2: am
6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
* commit '
adec2de2e35f3dab186d1abbbeb7497921a35c2c':
Prevent Dropbox from crashing system server pre-boot.
Dmitri Plotnikov [Tue, 18 Jan 2011 20:10:07 +0000 (12:10 -0800)]
am
b92d08a7: am
48395385: Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
* commit '
b92d08a7385f241722b2299a988ab7a55053f6ea':
Hiding the AsyncTaskLoader.waitForLoader method
Derek Sollenberger [Tue, 18 Jan 2011 20:10:00 +0000 (12:10 -0800)]
am
51b8a92e: am
788c5185: Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb
* commit '
51b8a92e23ff47e73faf67ea78ce1bd29b9a6d59':
Fix smart zoom for plugins that use OpenGL.
Andreas Huber [Tue, 18 Jan 2011 19:54:08 +0000 (11:54 -0800)]
am
529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
* commit '
529fc53d3fd298ee5aef20e3a07bd263f7376b8d':
Implement parsing of vbv buffering info in RTSP.
Andreas Huber [Tue, 18 Jan 2011 19:52:02 +0000 (11:52 -0800)]
Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
John Wang [Tue, 18 Jan 2011 19:46:14 +0000 (11:46 -0800)]
am
8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
* commit '
8d48c3d21f78cc2bc94682731d64b23ec0899824':
Enable AUTO_TIME_ZONE settings.
John Wang [Tue, 18 Jan 2011 19:43:53 +0000 (11:43 -0800)]
Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
Bryan Mawhinney [Tue, 18 Jan 2011 19:31:51 +0000 (11:31 -0800)]
am
3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb
* commit '
3a4d547c588dc3a1abb48988595dc17874660bb8':
Don't report 100% buffered when the stream ends prematurely.
Bryan Mawhinney [Tue, 18 Jan 2011 19:30:30 +0000 (11:30 -0800)]
Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb
Romain Guy [Tue, 18 Jan 2011 19:23:07 +0000 (11:23 -0800)]
am
89108d5c: Merge "Add support for skew()" into honeycomb
* commit '
89108d5c311d0cc6879fb41c6392f17c58644fee':
Add support for skew()
Dianne Hackborn [Tue, 18 Jan 2011 19:20:29 +0000 (11:20 -0800)]
am
3aa959b9: Merge "Fix issue #
3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
* commit '
3aa959b9ce7ac4ac241033b3eea9f2c0ce34d554':
Fix issue #
3362666 Activities launched from ongoing notifications don't animate
Mike Lockwood [Tue, 18 Jan 2011 19:20:22 +0000 (11:20 -0800)]
am
0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
* commit '
0de274b34c554a0e87b1071e001e41e416cd7678':
MTP: Fix problems with modification dates for folders and non-media files
John Reck [Tue, 18 Jan 2011 19:18:59 +0000 (11:18 -0800)]
am
d00207ff: Merge "WebStorage public API change" into honeycomb
* commit '
d00207ff87fa3e2d5430ea5c0980041c44738efe':
WebStorage public API change
David Turner [Tue, 18 Jan 2011 19:18:54 +0000 (11:18 -0800)]
am
6195eb13: Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
* commit '
6195eb134be28a62b2bd70b07b94f16311ef6169':
Prevent Dropbox from crashing system server pre-boot.
OSDN Git Service
