OSDN Git Service
The Android Open Source Project [Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
Gilles Debunne [Thu, 8 Dec 2011 18:01:29 +0000 (10:01 -0800)]
am
a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit '
a5a98a034b4d52c6bbc75e72f74f1a6ea1c61ed5':
IOOB is Suggestions
Gilles Debunne [Thu, 8 Dec 2011 18:01:27 +0000 (10:01 -0800)]
am
89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '
89f2e8a099c32cdbb8409482fe91dabea5a7673e':
Prevent NPE in SuggestionSpan
Gilles Debunne [Thu, 8 Dec 2011 17:59:44 +0000 (09:59 -0800)]
Merge "IOOB is Suggestions" into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 17:59:29 +0000 (09:59 -0800)]
Merge "Prevent NPE in SuggestionSpan" into ics-mr1
The Android Automerger [Thu, 8 Dec 2011 15:00:35 +0000 (07:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:16:22 +0000 (00:16 -0800)]
am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:31:03 +0000 (23:31 -0800)]
am
8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '
8e0ecbfc97606ea30d0d8216fea635888f766b9d':
Shortcut keys should be handled on down, not up.
Jeff Brown [Thu, 8 Dec 2011 07:31:02 +0000 (23:31 -0800)]
am
e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit '
e0e9fd981ca71aeaa45c888485c11788456bd838':
Fix system hotkey handling.
Jeff Brown [Thu, 8 Dec 2011 07:29:52 +0000 (23:29 -0800)]
Merge "Shortcut keys should be handled on down, not up." into ics-mr1
Jeff Brown [Thu, 8 Dec 2011 07:29:45 +0000 (23:29 -0800)]
Merge "Fix system hotkey handling." into ics-mr1
Dave Burke [Thu, 8 Dec 2011 04:41:27 +0000 (20:41 -0800)]
am
ef8913c0: Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
* commit '
ef8913c035e679ea8b8891e26db1fa571e9b9d54':
Remove dangerous and useless optimization Bug #
5525888
Dave Burke [Thu, 8 Dec 2011 04:40:10 +0000 (20:40 -0800)]
Merge "Remove dangerous and useless optimization Bug #
5525888" into ics-mr1
Wink Saville [Thu, 8 Dec 2011 04:18:06 +0000 (20:18 -0800)]
am
234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1
* commit '
234a5ef66275087aff9cfb94adc7608e9f358f11':
When the SIM_READY set current preferred network type.
Wink Saville [Thu, 8 Dec 2011 04:15:45 +0000 (20:15 -0800)]
Merge "When the SIM_READY set current preferred network type." into ics-mr1
Jaikumar Ganesh [Thu, 8 Dec 2011 03:52:11 +0000 (19:52 -0800)]
am
d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1
* commit '
d426c338a66f63f8e5528ac38ec5b61625f2c897':
Reduce likelihood of crash in state machine.
Jaikumar Ganesh [Thu, 8 Dec 2011 03:50:03 +0000 (19:50 -0800)]
Merge "Reduce likelihood of crash in state machine." into ics-mr1
John Wang [Thu, 8 Dec 2011 02:51:11 +0000 (18:51 -0800)]
am
ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1
* commit '
ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b':
Correct the dialing number of structured MMI.
John Wang [Thu, 8 Dec 2011 02:49:28 +0000 (18:49 -0800)]
Merge "Correct the dialing number of structured MMI." into ics-mr1
Gilles Debunne [Thu, 8 Dec 2011 02:42:04 +0000 (18:42 -0800)]
am
2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1
* commit '
2df13452e05745a3da624c34018da983173c32c4':
Insert into user dict with the correct locale
Gilles Debunne [Thu, 8 Dec 2011 02:41:04 +0000 (18:41 -0800)]
Merge "Insert into user dict with the correct locale" into ics-mr1
Adam Powell [Thu, 8 Dec 2011 01:57:08 +0000 (17:57 -0800)]
am
cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1
* commit '
cf6a6522fdbce05896d3a551f7cd6243857ceced':
Raise touch slop value from previous experiment
Adam Powell [Thu, 8 Dec 2011 01:55:35 +0000 (17:55 -0800)]
Merge "Raise touch slop value from previous experiment" into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 01:42:07 +0000 (17:42 -0800)]
am
29933fb2: Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
* commit '
29933fb26a4294a9bd30f9227809e28949252833':
Improve handling of small largeIcons in tablet ticker.
Daniel Sandler [Thu, 8 Dec 2011 01:40:07 +0000 (17:40 -0800)]
Merge "Improve handling of small largeIcons in tablet ticker." into ics-mr1
Joe Malin [Thu, 8 Dec 2011 01:14:47 +0000 (17:14 -0800)]
am
aa2719df: am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
aa2719df72225402737009b1cc2e3cfea8e74bc7':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:14:46 +0000 (17:14 -0800)]
am
0e385ee4: am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
0e385ee4de901f4c509374fad5bc040a2ac80721':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:12:43 +0000 (17:12 -0800)]
am
b259c04d: Merge "Merge commit \'
eee12419\' into manualmerge" into ics-mr1
* commit '
b259c04d4321536ef9f5cc9b55079d3bd450eef7':
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Robert Greenwalt [Thu, 8 Dec 2011 01:10:37 +0000 (17:10 -0800)]
am
fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit '
fbb09ea84f7a9df94358f05f4e680cb363bae663':
Fix NPE in trimV4AddrZeros.
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:56:17 +0000 (16:56 -0800)]
am
3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
* commit '
3b5555fc4483f6813f3df4787d98dd5357851566':
Make new ringer toggles on power menu accessible and navigable with keyboard.
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 00:35:46 +0000 (16:35 -0800)]
am
dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
* commit '
dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
Invalidate the whole status bar after layout transitions.
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:22:24 +0000 (16:22 -0800)]
am
1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
* commit '
1662a874fb65b915b6c3d8a213c1bd0c718059b5':
Update Armenian and Georgian fonts
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Jeff Brown [Thu, 8 Dec 2011 00:03:57 +0000 (16:03 -0800)]
am
ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
* commit '
ff3b5a828ea1f7409af4475898689804bed10ede':
Make the dock orientation override the HDMI orientation.
Dianne Hackborn [Thu, 8 Dec 2011 00:03:56 +0000 (16:03 -0800)]
am
87e06ec2: Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
* commit '
87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
Fix issue #
5144065: Tap on Music icon from Home screen...
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Winson Chung [Wed, 7 Dec 2011 22:35:04 +0000 (14:35 -0800)]
am
0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
* commit '
0a361b10a665a3d158c846722290f26ce62276e1':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
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
The Android Automerger [Wed, 7 Dec 2011 00:54:17 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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