OSDN Git Service
Dave Burke [Wed, 7 Dec 2011 22:08:13 +0000 (14:08 -0800)]
am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 21:17:04 +0000 (13:17 -0800)]
Robert Greenwalt [Wed, 7 Dec 2011 20:31:11 +0000 (12:31 -0800)]
am
f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit '
f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:08:41 +0000 (12:08 -0800)]
am
a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit '
a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
Irfan Sheriff [Wed, 7 Dec 2011 20:06:31 +0000 (12:06 -0800)]
Merge "Fix CS wakelock handling" into ics-mr1
Bart Sears [Wed, 7 Dec 2011 19:43:54 +0000 (11:43 -0800)]
am
b56076ac: Merge "Fix WebTextView rings" into ics-mr1
* commit '
b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
Bart Sears [Wed, 7 Dec 2011 19:41:57 +0000 (11:41 -0800)]
Merge "Fix WebTextView rings" into ics-mr1
Joe Malin [Wed, 7 Dec 2011 19:30:41 +0000 (11:30 -0800)]
am
3744d1fa: am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:28:25 +0000 (11:28 -0800)]
am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:26:20 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 18:36:54 +0000 (10:36 -0800)]
am
fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '
fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
Dianne Hackborn [Wed, 7 Dec 2011 18:33:19 +0000 (10:33 -0800)]
Merge "Truthiness is good." into ics-mr1
The Android Open Source Project [Wed, 7 Dec 2011 15:27:57 +0000 (07:27 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Irfan Sheriff [Wed, 7 Dec 2011 05:07:36 +0000 (21:07 -0800)]
am
8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '
8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
Irfan Sheriff [Wed, 7 Dec 2011 05:06:03 +0000 (21:06 -0800)]
Merge "Disable poor network connection alone" into ics-mr1
Scott Main [Wed, 7 Dec 2011 01:14:50 +0000 (17:14 -0800)]
am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug:
5542371
Scott Main [Wed, 7 Dec 2011 01:12:53 +0000 (17:12 -0800)]
am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug:
5542371
Andreas Huber [Wed, 7 Dec 2011 00:22:07 +0000 (16:22 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
Andreas Huber [Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)]
Merge "Merge commit '
babb7200' into manualmerge" into ics-mr1
Fabrice Di Meglio [Tue, 6 Dec 2011 23:49:29 +0000 (15:49 -0800)]
am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
1e99421196c1b34363267d6e6f02b16a299c9012':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
Fabrice Di Meglio [Tue, 6 Dec 2011 23:47:27 +0000 (15:47 -0800)]
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
Hong Teng [Tue, 6 Dec 2011 23:39:37 +0000 (15:39 -0800)]
am
6db79c35: Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int
* commit '
6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
Amith Yamasani [Tue, 6 Dec 2011 23:37:31 +0000 (15:37 -0800)]
am
f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit '
f336408000c4be36045401fb4df89528249e7383':
New and improved silent mode on lockscreen.
Hong Teng [Tue, 6 Dec 2011 23:37:25 +0000 (15:37 -0800)]
Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
Amith Yamasani [Tue, 6 Dec 2011 23:36:10 +0000 (15:36 -0800)]
Merge "New and improved silent mode on lockscreen." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Adam Powell [Tue, 6 Dec 2011 22:00:18 +0000 (14:00 -0800)]
am
720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
* commit '
720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
Lower touch slop in ViewConfiguration.
Adam Powell [Tue, 6 Dec 2011 21:58:20 +0000 (13:58 -0800)]
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
James Dong [Tue, 6 Dec 2011 20:55:39 +0000 (12:55 -0800)]
am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:46:46 +0000 (12:46 -0800)]
am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
Andreas Huber [Tue, 6 Dec 2011 20:44:53 +0000 (12:44 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:11:38 +0000 (12:11 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
Irfan Sheriff [Tue, 6 Dec 2011 19:37:40 +0000 (11:37 -0800)]
am
40cb30c2: am
7b62313e: Disable wifiwatchdog for now
* commit '
40cb30c2df2176c03f24cbdc194e3af5a4f64758':
Disable wifiwatchdog for now
Irfan Sheriff [Tue, 6 Dec 2011 19:34:58 +0000 (11:34 -0800)]
am
7b62313e: Disable wifiwatchdog for now
* commit '
7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
Gilles Debunne [Tue, 6 Dec 2011 19:22:19 +0000 (11:22 -0800)]
am
98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
* commit '
98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
Invalidated bounds tightened in TextView
Gilles Debunne [Tue, 6 Dec 2011 19:20:18 +0000 (11:20 -0800)]
Merge "Invalidated bounds tightened in TextView" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:36:30 +0000 (10:36 -0800)]
am
58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Dec 2011 18:34:41 +0000 (10:34 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Svetoslav Ganov [Tue, 6 Dec 2011 18:29:13 +0000 (10:29 -0800)]
am
ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
* commit '
ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
Adding a system preference whether to speak passwords in accessibility mode.
Svetoslav Ganov [Tue, 6 Dec 2011 18:27:04 +0000 (10:27 -0800)]
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
Jeff Brown [Tue, 6 Dec 2011 06:52:20 +0000 (22:52 -0800)]
am
4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit '
4079702ac27b51282a25de5f7c20f6fba6b71995':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
Jeff Brown [Tue, 6 Dec 2011 06:50:49 +0000 (22:50 -0800)]
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
Jim Miller [Tue, 6 Dec 2011 06:14:37 +0000 (22:14 -0800)]
am
17f9fe13: Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '
17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix
5705837: Dismiss keyguard when launching Settings from Statusbar
Jim Miller [Tue, 6 Dec 2011 06:12:54 +0000 (22:12 -0800)]
Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
Jesse Hall [Tue, 6 Dec 2011 05:24:53 +0000 (21:24 -0800)]
am
3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
* commit '
3e7b412d7d6332830ceaf123edb5e211757c69ce':
Fix statusbar crash on devices with no Bluetooth
Jesse Hall [Tue, 6 Dec 2011 05:23:29 +0000 (21:23 -0800)]
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
Matthew Xie [Tue, 6 Dec 2011 03:58:12 +0000 (19:58 -0800)]
am
0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
* commit '
0d9a41e74c81e8297ee439473c301a50da20cf0b':
Broadcast turning on/off intent as early as possible when switch on/off BT
Matthew Xie [Tue, 6 Dec 2011 03:56:54 +0000 (19:56 -0800)]
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:18:34 +0000 (19:18 -0800)]
am
0c0120ef: Merge "Fix issue #
5714517: App shortcuts can result in bad task intents" into ics-mr1
* commit '
0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
Fix issue #
5714517: App shortcuts can result in bad task intents
Dianne Hackborn [Tue, 6 Dec 2011 03:16:54 +0000 (19:16 -0800)]
Merge "Fix issue #
5714517: App shortcuts can result in bad task intents" into ics-mr1
Dianne Hackborn [Tue, 6 Dec 2011 03:09:17 +0000 (19:09 -0800)]
am
52245ac7: Merge "Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
* commit '
52245ac7c41735c561199d9ec7e9577d592ca852':
Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G
Dianne Hackborn [Tue, 6 Dec 2011 03:07:52 +0000 (19:07 -0800)]
Merge "Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
Daniel Sandler [Tue, 6 Dec 2011 03:04:13 +0000 (19:04 -0800)]
am
f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
* commit '
f66664a50e914e1cc5d66046cfc4c5b195a09eab':
Fix sticky menu icon on tablet status bar.
Daniel Sandler [Tue, 6 Dec 2011 03:02:28 +0000 (19:02 -0800)]
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
Adam Powell [Tue, 6 Dec 2011 01:40:18 +0000 (17:40 -0800)]
am
9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
* commit '
9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
Drop API level for notification compatibility BG to 8 (from 10)
Adam Powell [Tue, 6 Dec 2011 01:38:23 +0000 (17:38 -0800)]
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:22:58 +0000 (17:22 -0800)]
am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Fred Quintana [Tue, 6 Dec 2011 00:47:06 +0000 (16:47 -0800)]
am
b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
* commit '
b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
Fred Quintana [Tue, 6 Dec 2011 00:45:29 +0000 (16:45 -0800)]
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:13:49 +0000 (16:13 -0800)]
am
3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit '
3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
Remove debug log messages
Michael Kolb [Tue, 6 Dec 2011 00:12:35 +0000 (16:12 -0800)]
Merge "Remove debug log messages" into ics-mr1
Xia Wang [Mon, 5 Dec 2011 23:55:27 +0000 (15:55 -0800)]
am
e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '
e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
Add extra 2 minute for wifi to shutdown
Xia Wang [Mon, 5 Dec 2011 23:52:34 +0000 (15:52 -0800)]
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
Svetoslav Ganov [Mon, 5 Dec 2011 23:04:31 +0000 (15:04 -0800)]
am
da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
* commit '
da926cf284ff5f5ccf91dec088ff64d442cee25c':
TalkBack does not announce properly the buttons of the PIN lock.
Svetoslav Ganov [Mon, 5 Dec 2011 23:03:13 +0000 (15:03 -0800)]
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
Irfan Sheriff [Mon, 5 Dec 2011 22:22:03 +0000 (14:22 -0800)]
am
6b66e9e4: Switch to notifications for walled garden
* commit '
6b66e9e4c95b1c866ea63a0122fc199994fd7053':
Switch to notifications for walled garden
Peter Ng [Mon, 5 Dec 2011 20:36:24 +0000 (12:36 -0800)]
am
74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
* commit '
74b496dd8aab7e29bcba0c6502f773555c4ce29f':
Numberpicker section divider is now 2dp thick
Peter Ng [Mon, 5 Dec 2011 20:34:53 +0000 (12:34 -0800)]
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
Eric Fischer [Mon, 5 Dec 2011 20:28:06 +0000 (12:28 -0800)]
am
845b3efc: Merge "Add missing locale date format files." into ics-mr1
* commit '
845b3efc9935e66b718d8e9a56435bf039f97633':
Add missing locale date format files.
Eric Fischer [Mon, 5 Dec 2011 20:25:58 +0000 (12:25 -0800)]
Merge "Add missing locale date format files." into ics-mr1
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
Andreas Huber [Mon, 5 Dec 2011 20:01:26 +0000 (12:01 -0800)]
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
Dianne Hackborn [Mon, 5 Dec 2011 18:42:51 +0000 (10:42 -0800)]
am
003c15d7: Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
* commit '
003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
Fix issue #
5614559: Registering surface error in...
Dianne Hackborn [Mon, 5 Dec 2011 18:40:59 +0000 (10:40 -0800)]
Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
Michael Kolb [Mon, 5 Dec 2011 17:26:21 +0000 (09:26 -0800)]
am
277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
* commit '
277cbe5a951840558166020568fb1510285e2594':
set System UI visibility based on MediaController state
Michael Kolb [Mon, 5 Dec 2011 17:24:25 +0000 (09:24 -0800)]
Merge "set System UI visibility based on MediaController state" into ics-mr1
Jesse Hall [Sat, 3 Dec 2011 02:33:14 +0000 (18:33 -0800)]
am
f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
* commit '
f57c1388860486a70cc773f2cfeaa3ea3b38a473':
SurfaceFlinger: fix layer removal race condition
Jesse Hall [Sat, 3 Dec 2011 02:31:03 +0000 (18:31 -0800)]
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
Robert Greenwalt [Sat, 3 Dec 2011 00:54:04 +0000 (16:54 -0800)]
am
2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '
2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
Be careful sharing connections when dun is in play
Robert Greenwalt [Sat, 3 Dec 2011 00:52:29 +0000 (16:52 -0800)]
Merge "Be careful sharing connections when dun is in play" into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 23:31:07 +0000 (15:31 -0800)]
am
2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
* commit '
2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
Handle animations in Views' rectangle clipping methods.
Gilles Debunne [Fri, 2 Dec 2011 23:28:56 +0000 (15:28 -0800)]
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
John Reck [Fri, 2 Dec 2011 22:49:19 +0000 (14:49 -0800)]
am
43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '
43bc6b094edda6baa8123115a33afaf454525376':
Fix updateDoubleTapZoom logic
John Reck [Fri, 2 Dec 2011 22:47:04 +0000 (14:47 -0800)]
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:22:17 +0000 (13:22 -0800)]
am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Fri, 2 Dec 2011 21:22:15 +0000 (13:22 -0800)]
am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
Mike Lockwood [Fri, 2 Dec 2011 21:20:49 +0000 (13:20 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:20:39 +0000 (13:20 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
Chia-chi Yeh [Fri, 2 Dec 2011 20:48:35 +0000 (12:48 -0800)]
am
25bcbbb5: am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '
25bcbbb5971e2832c3020ee406b27d641d4ca05b':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Chia-chi Yeh [Fri, 2 Dec 2011 20:46:51 +0000 (12:46 -0800)]
am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
* commit '
431c3e4c7e2103865a90501a552b4e5145ed3f35':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Chia-chi Yeh [Fri, 2 Dec 2011 20:45:44 +0000 (12:45 -0800)]
Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
Jesse Hall [Fri, 2 Dec 2011 20:35:22 +0000 (12:35 -0800)]
am
6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
* commit '
6d90c1c6fedc7add177418324ba5e591af543fa4':
Disable GLES20Canvas on emu w/o native GL
Jesse Hall [Fri, 2 Dec 2011 20:33:20 +0000 (12:33 -0800)]
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
Roman Nurik [Fri, 2 Dec 2011 20:01:36 +0000 (12:01 -0800)]
am
55347e65: am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
55347e65e229ed63f7e18cb5b82639174c0f54bb':
Reduce file size for ADL presentation shareable.
Roman Nurik [Fri, 2 Dec 2011 19:59:07 +0000 (11:59 -0800)]
am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.