OSDN Git Service
Svetoslav Ganov [Tue, 6 Dec 2011 18:32:51 +0000 (10:32 -0800)]
am
1113e755: am
ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
* commit '
1113e75588782cc23074b9a9bb887de06eff8a49':
Adding a system preference whether to speak passwords in accessibility mode.
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
The Android Open Source Project [Tue, 6 Dec 2011 17:02:57 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
Jeff Brown [Tue, 6 Dec 2011 16:49:53 +0000 (08:49 -0800)]
am
e589fc89: (-s ours) am
4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit '
e589fc8984d2be7a8b78d78a5290c8fed014dcbd':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
Jim Miller [Tue, 6 Dec 2011 16:49:51 +0000 (08:49 -0800)]
am
a3e3c4dd: am
17f9fe13: Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '
a3e3c4dd37139615adb88a38e6a99402e0cfcd2b':
Fix
5705837: Dismiss keyguard when launching Settings from Statusbar
George Mount [Tue, 6 Dec 2011 16:42:07 +0000 (08:42 -0800)]
Merge "Remove inFullScreenMode JNI call during drawGL call."
Claudia de Veaux [Tue, 6 Dec 2011 16:27:11 +0000 (08:27 -0800)]
Merge "Edits to strings to meet UI text standards. * Use contractions. * Use \u2026 instead of ... for ellipsis. * Use straight quotes (for now that's the standard). * Made the permission descriptions consistent. * Use sentence case everywhere except for proper nouns. * Notification messages need ending punctuation. * Use "touch" instead of "tap". * Use "choose" instead of "select", except when selecting text. * Use "sign into" instead of "sign in to". * Use "Do you want..." instead of "Would you like..." * Autofill has only initial cap."
Brian Colonna [Tue, 6 Dec 2011 15:25:59 +0000 (07:25 -0800)]
Merge "Making Face Unlock fix that wasn't proerly merged in master"
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:27:30 +0000 (21:27 -0800)]
am
2eb4a5ee: am
3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
* commit '
2eb4a5ee5bebf4120de217adf5a9f72b0c94951b':
Fix statusbar crash on devices with no Bluetooth
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
Jeff Brown [Tue, 6 Dec 2011 05:19:46 +0000 (21:19 -0800)]
Merge "Use a Choreographer to schedule animation and drawing."
Jeff Brown [Tue, 6 Dec 2011 05:19:41 +0000 (21:19 -0800)]
Merge "Add a new class to receive vsync events."
Jeff Brown [Tue, 6 Dec 2011 05:19:38 +0000 (21:19 -0800)]
Merge "Refactor ValueAnimator to reduce use of ThreadLocals."
Mathias Agopian [Tue, 6 Dec 2011 05:14:03 +0000 (21:14 -0800)]
Merge "fix a deadlock when removing a DisplayEventConnection"
Jeff Brown [Tue, 6 Dec 2011 04:43:55 +0000 (20:43 -0800)]
Merge "Harfbuzz assumes the length of the item is at least 1."
Jeff Brown [Tue, 6 Dec 2011 04:43:36 +0000 (20:43 -0800)]
Merge "Ensure log_clusters array is big enough."
The Android Automerger [Tue, 6 Dec 2011 04:36:01 +0000 (20:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Matthew Xie [Tue, 6 Dec 2011 04:00:46 +0000 (20:00 -0800)]
am
12479141: am
0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
* commit '
12479141dd3e63a5f26a4509d0922c9ef9e3d78c':
Broadcast turning on/off intent as early as possible when switch on/off BT
Mathias Agopian [Mon, 5 Dec 2011 22:33:34 +0000 (14:33 -0800)]
fix a deadlock when removing a DisplayEventConnection
the deadlock would happen when the pipe became invalid and SF
trying to remove the connection from its list.
we know make sure to process events without holding a lock.
Change-Id: I39927ed8824fc7811e16db3c7608a2ebc72d9642
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:20:45 +0000 (19:20 -0800)]
am
ec42750e: am
0c0120ef: Merge "Fix issue #
5714517: App shortcuts can result in bad task intents" into ics-mr1
* commit '
ec42750e4d0e695515d078fb1f222c99a705fd93':
Fix issue #
5714517: App shortcuts can result in bad task intents
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:11:23 +0000 (19:11 -0800)]
am
24ec8703: am
52245ac7: Merge "Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
* commit '
24ec870322c801b0662d8b8d53232e89a94bc00a':
Fix issue #
5713576: Home redraws after returning from app on Nexus S 4G
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:06:17 +0000 (19:06 -0800)]
am
83f79c90: am
f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
* commit '
83f79c90989bab2758d5c7d232eb537fb2242e8b':
Fix sticky menu icon on tablet status bar.
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:49:04 +0000 (17:49 -0800)]
am
7cd1851d: am
9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
* commit '
7cd1851d82bc44acd1bd6d36f2a5f1ebccaefabf':
Drop API level for notification compatibility BG to 8 (from 10)
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:25:37 +0000 (17:25 -0800)]
am
5433e25f: am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
5433e25f6ce013860ff2a074ad8d1158cc39ab91':
audioflinger: fix audio skipping over A2DP
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:49:37 +0000 (16:49 -0800)]
am
f3f7d65b: 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 '
f3f7d65b650dec7f4eacefa1f0174fadfce5ec6e':
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: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:33:01 +0000 (16:33 -0800)]
am
cda010d5: am
3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit '
cda010d556552b533191d8bc90454c99c133549f':
Remove debug log messages
Xia Wang [Tue, 6 Dec 2011 00:32:59 +0000 (16:32 -0800)]
am
96f660f4: am
e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '
96f660f4a8b99ff387e17474f2574e4e284ceeb8':
Add extra 2 minute for wifi to shutdown
Svetoslav Ganov [Tue, 6 Dec 2011 00:32:55 +0000 (16:32 -0800)]
am
96de4c3b: am
da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
* commit '
96de4c3befe7cefac81b1d317f752ba76b9fe7ce':
TalkBack does not announce properly the buttons of the PIN lock.
Irfan Sheriff [Tue, 6 Dec 2011 00:32:49 +0000 (16:32 -0800)]
am
f81674ca: am
6b66e9e4: Switch to notifications for walled garden
* commit '
f81674ca5249313ce820ceb5329d82a2862abab6':
Switch to notifications for walled garden
Peter Ng [Tue, 6 Dec 2011 00:32:44 +0000 (16:32 -0800)]
am
9467d0bd: am
74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
* commit '
9467d0bde1e3b0065479f731236055e526664caa':
Numberpicker section divider is now 2dp thick
Eric Fischer [Tue, 6 Dec 2011 00:32:42 +0000 (16:32 -0800)]
am
ab50285a: am
845b3efc: Merge "Add missing locale date format files." into ics-mr1
* commit '
ab50285ae481e9d749048e80a3d1e79f8545c1ed':
Add missing locale date format files.
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
Romain Guy [Mon, 5 Dec 2011 22:50:54 +0000 (14:50 -0800)]
Merge "Make sure onPostExecute() is never called after cancel() Bug #
5651553"
Andreas Huber [Mon, 5 Dec 2011 22:26:22 +0000 (14:26 -0800)]
Merge "resolved conflicts for merge of
07bacabe to master"
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
Siva Velusamy [Mon, 5 Dec 2011 22:18:46 +0000 (14:18 -0800)]
Merge "gltrace: Make framebuffer contents an optional message."
Siva Velusamy [Mon, 5 Dec 2011 19:12:31 +0000 (11:12 -0800)]
gltrace: Make framebuffer contents an optional message.
Currently, the contents of the FrameBuffer are sent by encoding
them as the last argument to the function call. As a result, it is
not possible to know if a message has the framebuffer encoded in it
without looking at the function type.
This patch modifies the protobuf definition to include a separate
optional framebuffer message.
Change-Id: Ief3a6950052d927ca0743e729457435b48c25a92
Irfan Sheriff [Mon, 5 Dec 2011 22:07:06 +0000 (14:07 -0800)]
Merge "p2p enhancements"
Andreas Huber [Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)]
resolved conflicts for merge of
07bacabe to master
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
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
Romain Guy [Mon, 5 Dec 2011 19:56:09 +0000 (11:56 -0800)]
Merge "Clip text correctly Bug #
5706056"
Dianne Hackborn [Mon, 5 Dec 2011 18:45:16 +0000 (10:45 -0800)]
am
803caff1: am
003c15d7: Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
* commit '
803caff1dc307a8895e9f3560112f969fa3f6f39':
Fix issue #
5614559: Registering surface error in...
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:28:51 +0000 (09:28 -0800)]
am
32e914fc: am
277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
* commit '
32e914fc0366401b896f34d60119f92f625e6973':
set System UI visibility based on MediaController state
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
The Android Open Source Project [Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
Narayan Kamath [Mon, 5 Dec 2011 15:41:59 +0000 (07:41 -0800)]
Merge "Simplify the implementation of AudioPlaybackHandler."
Mathias Agopian [Sun, 4 Dec 2011 08:45:50 +0000 (00:45 -0800)]
Merge "fix an issue where invalidate/transactions could be missed"
Jeff Brown [Sun, 4 Dec 2011 01:35:19 +0000 (17:35 -0800)]
Merge "Remove type tests when recycling input events."
Mathias Agopian [Sat, 3 Dec 2011 22:47:29 +0000 (14:47 -0800)]
fix an issue where invalidate/transactions could be missed
Change-Id: I84a1fcba1317b2631f5441de7b7ecd12af5ad022
Jesse Hall [Sat, 3 Dec 2011 02:35:54 +0000 (18:35 -0800)]
am
a91e54fe: am
f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
* commit '
a91e54fed6a0690d59c97bab9b081b2614880563':
SurfaceFlinger: fix layer removal race condition
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 01:57:37 +0000 (17:57 -0800)]
am
00f1ac80: am
2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '
00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
Be careful sharing connections when dun is in play
Gilles Debunne [Sat, 3 Dec 2011 01:57:31 +0000 (17:57 -0800)]
am
0c7e894e: am
2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
* commit '
0c7e894e79bea35f979d30e4e3bb6115b102cafd':
Handle animations in Views' rectangle clipping methods.
John Reck [Sat, 3 Dec 2011 01:57:29 +0000 (17:57 -0800)]
am
6d3e51d4: am
43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '
6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
Fix updateDoubleTapZoom logic
Mike Lockwood [Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)]
am
9f3f3c2f: (-s ours) am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)]
am
7bbc3c4b: (-s ours) 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 '
7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
Chia-chi Yeh [Sat, 3 Dec 2011 01:57:14 +0000 (17:57 -0800)]
am
939a3dd4: 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 '
939a3dd4e7e2282786a8c5270855b611317ad241':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
Jesse Hall [Sat, 3 Dec 2011 01:57:09 +0000 (17:57 -0800)]
am
54cf27d7: am
6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
* commit '
54cf27d7bbe27b1096f5e060c540f07dac07f1d0':
Disable GLES20Canvas on emu w/o native GL
Roman Nurik [Sat, 3 Dec 2011 01:57:07 +0000 (17:57 -0800)]
am
04bd27eb: (-s ours) am
55347e65: am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
04bd27ebed36d396dfdca0b6c8e6f6b08d8e7e0d':
Reduce file size for ADL presentation shareable.
Amith Yamasani [Sat, 3 Dec 2011 01:49:31 +0000 (17:49 -0800)]
am
f8dad0b3: am
afd01086: Merge "Further volume improvements." into ics-mr1
* commit '
f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
Further volume improvements.
Gilles Debunne [Sat, 3 Dec 2011 01:49:28 +0000 (17:49 -0800)]
am
99019d52: (-s ours) am
f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1
* commit '
99019d522335690df4c563e1dbe489bf843fe58e':
(de)activating spell check taken into account immediately
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
Mathias Agopian [Sat, 3 Dec 2011 00:49:06 +0000 (16:49 -0800)]
Merge "fix an issue where updates could starve transactions"
The Android Automerger [Sat, 3 Dec 2011 00:21:23 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Fabrice Di Meglio [Sat, 3 Dec 2011 00:21:14 +0000 (16:21 -0800)]
Merge "TextLayoutCache Fix compilation issue"
OSDN Git Service
