OSDN Git Service
Jack Palevich [Fri, 9 Dec 2011 22:06:07 +0000 (14:06 -0800)]
Fix convert8To4, convert8To5
See b/
5680952 "Compilation warnings in etc1.cpp" for discussion.
Fixes b/
5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
Stephen Hines [Wed, 7 Dec 2011 02:33:42 +0000 (18:33 -0800)]
Merge "Remove warnings about unused results."
Stephen Hines [Wed, 7 Dec 2011 02:33:35 +0000 (18:33 -0800)]
Merge "NULL should not be const for RS."
Jeff Brown [Wed, 7 Dec 2011 02:09:35 +0000 (18:09 -0800)]
Merge "Disable postponing performTraversals(), for now."
Michael Jurka [Wed, 7 Dec 2011 01:37:06 +0000 (17:37 -0800)]
Merge "System bar now renders the back button for recents"
Scott Main [Wed, 7 Dec 2011 01:17:00 +0000 (17:17 -0800)]
am
0f668951: am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0f668951d78ad8c45af54a6c06d3c560eed29108':
docs: fix broken links bug:
5542371
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:59:52 +0000 (16:59 -0800)]
am
92860d5d: (-s ours) am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
Fabrice Di Meglio [Wed, 7 Dec 2011 00:59:50 +0000 (16:59 -0800)]
am
59685954: (-s ours) am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
596859549254a63c619fdc403e49e809751ab832':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
Hong Teng [Wed, 7 Dec 2011 00:59:45 +0000 (16:59 -0800)]
am
2be608f8: 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 an
* commit '
2be608f88cd469b40a472551f22a9d40903beede':
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 [Wed, 7 Dec 2011 00:59:44 +0000 (16:59 -0800)]
am
d49ec62c: am
f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit '
d49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
Adam Powell [Wed, 7 Dec 2011 00:57:35 +0000 (16:57 -0800)]
Merge "resolved conflicts for merge of
6a828712 to master"
Adam Powell [Wed, 7 Dec 2011 00:40:49 +0000 (16:40 -0800)]
resolved conflicts for merge of
6a828712 to master
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
Jeff Brown [Wed, 7 Dec 2011 00:47:29 +0000 (16:47 -0800)]
Merge "Add tap and swipe capabilities to the "input" tool."
Romain Guy [Wed, 7 Dec 2011 00:37:58 +0000 (16:37 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817"
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
Jeff Brown [Wed, 7 Dec 2011 00:18:03 +0000 (16:18 -0800)]
Merge "Fix PIN pad."
James Dong [Wed, 7 Dec 2011 00:04:38 +0000 (16:04 -0800)]
am
49782b81: (-s ours) am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
Andreas Huber [Wed, 7 Dec 2011 00:04:36 +0000 (16:04 -0800)]
am
c4738293: (-s ours) am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
c4738293527618f9a228c3f0f645c0a0704ada9c':
DO NOT MERGE: Remove the AVI extractor.
Irfan Sheriff [Wed, 7 Dec 2011 00:04:30 +0000 (16:04 -0800)]
am
5e2e7d5f: am
40cb30c2: am
7b62313e: Disable wifiwatchdog for now
* commit '
5e2e7d5fb81266640f8284abb25fe8be06693f5b':
Disable wifiwatchdog for now
Gilles Debunne [Tue, 6 Dec 2011 23:57:47 +0000 (15:57 -0800)]
resolved conflicts for merge of
fb729202 to master
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
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
Tor Norbye [Tue, 6 Dec 2011 21:31:04 +0000 (13:31 -0800)]
Merge "Upgrade layoutlib generation code to use ASM 4.0"
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
Jeff Sharkey [Tue, 6 Dec 2011 18:38:55 +0000 (10:38 -0800)]
Merge "Move native vold calls to varargs."
Eric Fischer [Tue, 6 Dec 2011 18:38:14 +0000 (10:38 -0800)]
am
e9493f68: (-s ours) am
58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
e9493f68381c2fb01b1e400aa5dbd25e77281c56':
Import revised translations. DO NOT MERGE
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: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
OSDN Git Service
