OSDN Git Service
Gilles Debunne [Fri, 2 Dec 2011 00:10:03 +0000 (16:10 -0800)]
am
b4812f8a: am
335c4e6c: Broken build. New methods made private.
* commit '
b4812f8a815a4c4a9896e73412f4011d7a30f03f':
Broken build. New methods made private.
Gilles Debunne [Fri, 2 Dec 2011 00:06:51 +0000 (16:06 -0800)]
am
335c4e6c: Broken build. New methods made private.
* commit '
335c4e6cb2094c7cbd6039e0c7915702b69e7657':
Broken build. New methods made private.
Gilles Debunne [Thu, 1 Dec 2011 23:09:00 +0000 (15:09 -0800)]
am
120cb5af: am
58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
* commit '
120cb5afd345a97c5e43683232c857ce2e5c8f29':
Scroll performance improved in multiline TextEdit
Gilles Debunne [Thu, 1 Dec 2011 23:08:58 +0000 (15:08 -0800)]
am
ee8862dc: am
eb189d39: Merge "Performance improvement in TextView" into ics-mr1
* commit '
ee8862dc7b7266ee99633e0f13b2393a2185c30d':
Performance improvement in TextView
Gilles Debunne [Thu, 1 Dec 2011 23:07:10 +0000 (15:07 -0800)]
am
58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
* commit '
58d8953958ce452c5080eaa582d7e5d2b5017398':
Scroll performance improved in multiline TextEdit
Gilles Debunne [Thu, 1 Dec 2011 23:07:08 +0000 (15:07 -0800)]
am
eb189d39: Merge "Performance improvement in TextView" into ics-mr1
* commit '
eb189d399a459c2e1ad29e1beba70d1de9f447b3':
Performance improvement in TextView
Gilles Debunne [Thu, 1 Dec 2011 23:06:49 +0000 (15:06 -0800)]
am
a8205d24: am
09cbff02: Merge "Better handles\' visibility test" into ics-mr1
* commit '
a8205d24703fc353076cf30795b3a06a87208cfa':
Better handles' visibility test
Gilles Debunne [Thu, 1 Dec 2011 23:04:46 +0000 (15:04 -0800)]
am
09cbff02: Merge "Better handles\' visibility test" into ics-mr1
* commit '
09cbff0294a27d33c93de50e0b4471ad86154a84':
Better handles' visibility test
Gilles Debunne [Thu, 1 Dec 2011 23:04:35 +0000 (15:04 -0800)]
Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:55 +0000 (15:03 -0800)]
Merge "Performance improvement in TextView" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 23:03:27 +0000 (15:03 -0800)]
Merge "Better handles' visibility test" into ics-mr1
Winson Chung [Thu, 1 Dec 2011 22:59:45 +0000 (14:59 -0800)]
am
ecdc38be: am
cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug
5617734)" into ics-mr1
* commit '
ecdc38be1ef6ee5375ff6abe92f2e1e84a78ea57':
Adding a sound when you take a screenshot. (Bug
5617734)
Winson Chung [Thu, 1 Dec 2011 22:57:50 +0000 (14:57 -0800)]
am
cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug
5617734)" into ics-mr1
* commit '
cea32ecd3aef013bc5da6e401eeb8e9e8cd1b595':
Adding a sound when you take a screenshot. (Bug
5617734)
Winson Chung [Thu, 1 Dec 2011 22:55:41 +0000 (14:55 -0800)]
Merge "Adding a sound when you take a screenshot. (Bug
5617734)" into ics-mr1
Kenny Root [Thu, 1 Dec 2011 22:18:58 +0000 (14:18 -0800)]
am
7f36d421: am
5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
* commit '
7f36d4217269e79f8409c46f12f10464a1f585ea':
Fix free_cache to actually work
Kenny Root [Thu, 1 Dec 2011 22:16:18 +0000 (14:16 -0800)]
am
5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
* commit '
5a7c91769f011bc150c9def9edab9cccb4761c66':
Fix free_cache to actually work
Kenny Root [Thu, 1 Dec 2011 22:14:22 +0000 (14:14 -0800)]
Merge "Fix free_cache to actually work" into ics-mr1
Glenn Kasten [Thu, 1 Dec 2011 21:55:41 +0000 (13:55 -0800)]
Merge "Add README for media "automated" tests"
Roman Nurik [Thu, 1 Dec 2011 21:47:29 +0000 (13:47 -0800)]
am
aeda641e: am
a7d825dd: am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
aeda641e331e86f86b19493f9e5c1be38a45f5db':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:44:41 +0000 (13:44 -0800)]
am
a7d825dd: am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:42:23 +0000 (13:42 -0800)]
am
c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
* commit '
c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.
Roman Nurik [Thu, 1 Dec 2011 21:40:38 +0000 (13:40 -0800)]
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
Matthew Xie [Thu, 1 Dec 2011 21:36:48 +0000 (13:36 -0800)]
am
6001d3ad: am
1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '
6001d3ad9f5ddb5be09ec6e70b5e646cb9a0f469':
Unlink the Binder DeathRecipient when removing a Bluetooth service record
Matthew Xie [Thu, 1 Dec 2011 21:34:18 +0000 (13:34 -0800)]
am
1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
* commit '
1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
Unlink the Binder DeathRecipient when removing a Bluetooth service record
Matthew Xie [Thu, 1 Dec 2011 21:32:19 +0000 (13:32 -0800)]
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
Jeff Sharkey [Thu, 1 Dec 2011 21:27:38 +0000 (13:27 -0800)]
Merge "Uniform rethrowing of NDC exceptions."
Svetoslav Ganov [Thu, 1 Dec 2011 21:01:50 +0000 (13:01 -0800)]
am
0bfdd7c2: am
e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
* commit '
0bfdd7c2927fb683b89fdd52befe643e8e069e77':
Fix memory leaks in the accessibility layer.
Svetoslav Ganov [Thu, 1 Dec 2011 20:59:11 +0000 (12:59 -0800)]
am
e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
* commit '
e9f24a43021734d28a4f65ebc804847b31ce13e8':
Fix memory leaks in the accessibility layer.
Svetoslav Ganov [Thu, 1 Dec 2011 20:57:12 +0000 (12:57 -0800)]
Merge "Fix memory leaks in the accessibility layer." into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 20:52:07 +0000 (12:52 -0800)]
am
c4c19a23: am
55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
* commit '
c4c19a23d74896b4117bf274d1d7e0268ab401c3':
Improve how we manage the previous app.
Dianne Hackborn [Thu, 1 Dec 2011 20:49:38 +0000 (12:49 -0800)]
am
55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
* commit '
55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
Improve how we manage the previous app.
Dianne Hackborn [Thu, 1 Dec 2011 20:47:43 +0000 (12:47 -0800)]
Merge "Improve how we manage the previous app." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 20:41:57 +0000 (12:41 -0800)]
am
0c22fa74: am
b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
* commit '
0c22fa749a779fd539c4c13f83364efc611c3694':
Add copious navigation bar info to SystemUI dumps.
Bill Gruber [Thu, 1 Dec 2011 20:41:54 +0000 (12:41 -0800)]
am
92a2f5fd: am
715a3c52: am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
92a2f5fd6a8e423d6c9ef5b42c576a2ce7e900a2':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 20:41:48 +0000 (12:41 -0800)]
am
42e4ecc7: am
a8fa89f7: am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
42e4ecc7277bb568971c701e14ac2f97da7b4d02':
docs: dashboard update for 12/1
Amith Yamasani [Thu, 1 Dec 2011 20:17:50 +0000 (12:17 -0800)]
am
52976f04: am
e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
* commit '
52976f04d8bebf44398a94cf5796f6a998c8935d':
No clicking on volume icon in volume dialog.
Scott Main [Thu, 1 Dec 2011 20:17:46 +0000 (12:17 -0800)]
am
075bd9eb: am
4f926932: am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
075bd9eb93449fb0a5c6da1379e11f51f8379794':
docs: remove broken link from renderscript docs bug:
5696178
Daniel Sandler [Thu, 1 Dec 2011 20:11:23 +0000 (12:11 -0800)]
am
b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
* commit '
b73dc9c852f73c7d61f317b5ec7b74766d2f22d5':
Add copious navigation bar info to SystemUI dumps.
Daniel Sandler [Thu, 1 Dec 2011 20:09:51 +0000 (12:09 -0800)]
Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 19:59:08 +0000 (11:59 -0800)]
am
4fec974c: am
0433c157: Merge "TextViews keep focus after Done" into ics-mr1
* commit '
4fec974c2f75886516509699ccfc0100b029fe4d':
TextViews keep focus after Done
Gilles Debunne [Thu, 1 Dec 2011 19:59:07 +0000 (11:59 -0800)]
am
d732efa2: am
b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit '
d732efa2972eaaa22ff921c39744ec969598bcd0':
Revert "IME action (done, next...) correctly handled"
Bill Gruber [Thu, 1 Dec 2011 19:56:55 +0000 (11:56 -0800)]
am
715a3c52: am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
715a3c52ccd896265b4e57835d196bf7a2a17437':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 19:56:54 +0000 (11:56 -0800)]
am
a8fa89f7: am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
a8fa89f7f4e658c41dba466b10459208d673bc3a':
docs: dashboard update for 12/1
Bill Gruber [Thu, 1 Dec 2011 19:54:57 +0000 (11:54 -0800)]
am
92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
* commit '
92ad16d342aa4d39bad33600161b3799b84716f3':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 19:54:55 +0000 (11:54 -0800)]
am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1
Bill Gruber [Thu, 1 Dec 2011 19:53:23 +0000 (11:53 -0800)]
Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766" into ics-mr0
Scott Main [Thu, 1 Dec 2011 19:53:17 +0000 (11:53 -0800)]
Merge "docs: dashboard update for 12/1" into ics-mr0
Amith Yamasani [Thu, 1 Dec 2011 19:37:32 +0000 (11:37 -0800)]
am
e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
* commit '
e9b0608c76bd19356f3141358ffdf134b7a9700f':
No clicking on volume icon in volume dialog.
Amith Yamasani [Thu, 1 Dec 2011 19:35:30 +0000 (11:35 -0800)]
Merge "No clicking on volume icon in volume dialog." into ics-mr1
Scott Main [Thu, 1 Dec 2011 19:23:15 +0000 (11:23 -0800)]
am
4f926932: am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
docs: remove broken link from renderscript docs bug:
5696178
Scott Main [Thu, 1 Dec 2011 19:20:03 +0000 (11:20 -0800)]
am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug:
5696178
Chet Haase [Thu, 1 Dec 2011 18:35:18 +0000 (10:35 -0800)]
Merge "Protect code in ViewPropertyAnimator from potential null deref"
Gilles Debunne [Thu, 1 Dec 2011 18:24:23 +0000 (10:24 -0800)]
am
0433c157: Merge "TextViews keep focus after Done" into ics-mr1
* commit '
0433c157141b9122f6c61498e909770f1db27c7c':
TextViews keep focus after Done
Gilles Debunne [Thu, 1 Dec 2011 18:24:21 +0000 (10:24 -0800)]
am
b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit '
b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
Revert "IME action (done, next...) correctly handled"
Andreas Huber [Thu, 1 Dec 2011 18:22:19 +0000 (10:22 -0800)]
am
10526a0b: am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Gilles Debunne [Thu, 1 Dec 2011 18:22:15 +0000 (10:22 -0800)]
Merge "TextViews keep focus after Done" into ics-mr1
Gilles Debunne [Thu, 1 Dec 2011 18:21:59 +0000 (10:21 -0800)]
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
Andreas Huber [Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)]
am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Andreas Huber [Thu, 1 Dec 2011 18:18:19 +0000 (10:18 -0800)]
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
Robert Greenwalt [Thu, 1 Dec 2011 17:46:14 +0000 (09:46 -0800)]
am
c8e643a8: am
22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
* commit '
c8e643a86345ef7e2807946107062c9d8635455d':
Fix state synchronization problem.
Robert Greenwalt [Thu, 1 Dec 2011 17:44:12 +0000 (09:44 -0800)]
am
22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
* commit '
22d5d7b6e865e36eb3e057bc27d339d56c292d20':
Fix state synchronization problem.
Robert Greenwalt [Thu, 1 Dec 2011 17:42:13 +0000 (09:42 -0800)]
Merge "Fix state synchronization problem." into ics-mr1
Ben Murdoch [Thu, 1 Dec 2011 17:08:00 +0000 (09:08 -0800)]
am
fc00b6aa: am
90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit '
fc00b6aac4a5f9222d36b7db5209bca9b63b55d6':
Fix crash with HTML5 video.
Ben Murdoch [Thu, 1 Dec 2011 17:05:55 +0000 (09:05 -0800)]
am
90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit '
90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
Fix crash with HTML5 video.
Ben Murdoch [Thu, 1 Dec 2011 17:03:22 +0000 (09:03 -0800)]
Merge "Fix crash with HTML5 video." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 14:33:07 +0000 (06:33 -0800)]
am
859bc015: (-s ours) am
2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '
859bc0153e37a7eb65216c0a5f7ea46f5559b453':
Put screensavers back in the icebox for now. DO NOT MERGE.
Daniel Sandler [Thu, 1 Dec 2011 14:31:09 +0000 (06:31 -0800)]
am
2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '
2a40d0d92b208021b492e9af3d944720cbf269fc':
Put screensavers back in the icebox for now. DO NOT MERGE.
Daniel Sandler [Thu, 1 Dec 2011 14:29:53 +0000 (06:29 -0800)]
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
Bart Sears [Thu, 1 Dec 2011 06:33:24 +0000 (22:33 -0800)]
am
5a4e807a: am
41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '
5a4e807af8661d35e27157fa224a8e4db0e66f7c':
fix position of WebTextView on scrolling layers
Bart Sears [Thu, 1 Dec 2011 06:31:08 +0000 (22:31 -0800)]
am
41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '
41a5774a99215025628b83db54c45f84b876678e':
fix position of WebTextView on scrolling layers
Bart Sears [Thu, 1 Dec 2011 06:29:16 +0000 (22:29 -0800)]
Merge "fix position of WebTextView on scrolling layers" into ics-mr1
Adam Cohen [Thu, 1 Dec 2011 05:14:53 +0000 (21:14 -0800)]
am
2a163f61: am
557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
* commit '
2a163f6171c06d9bbee9ce49fad478336210d37d':
Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)
Adam Cohen [Thu, 1 Dec 2011 05:13:04 +0000 (21:13 -0800)]
am
557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
* commit '
557a1772f676480da75fff81ff38d6e896fce0a2':
Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)
Adam Cohen [Thu, 1 Dec 2011 05:10:27 +0000 (21:10 -0800)]
Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
Dianne Hackborn [Thu, 1 Dec 2011 04:53:33 +0000 (20:53 -0800)]
am
f5fd08d6: am
a1240184: Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
* commit '
f5fd08d64959f23ba87f4da4771ca511b05a6be0':
Fix issue #
5433192 and maybe #
5433192
Dianne Hackborn [Thu, 1 Dec 2011 04:50:57 +0000 (20:50 -0800)]
am
a1240184: Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
* commit '
a1240184efd1d4391540a6e3e9cae50d56d05cb2':
Fix issue #
5433192 and maybe #
5433192
Dianne Hackborn [Thu, 1 Dec 2011 04:49:21 +0000 (20:49 -0800)]
Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
Romain Guy [Thu, 1 Dec 2011 04:22:19 +0000 (20:22 -0800)]
Merge "Optimize away unnecessary state changes"
Fabrice Di Meglio [Thu, 1 Dec 2011 04:09:57 +0000 (20:09 -0800)]
Merge "TextLayoutCache Code cleaning"
satok [Thu, 1 Dec 2011 02:41:59 +0000 (18:41 -0800)]
am
b7dda6d3: am
b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit '
b7dda6d34b9dad2cd3094125b92a1503a9befa7c':
Fix ConcurrentModificationException in TextServicesManagerService
Svetoslav Ganov [Thu, 1 Dec 2011 02:15:01 +0000 (18:15 -0800)]
resolved conflicts for merge of
26f7a81f to master
Change-Id: I6bf5fd7c0de7945cef84602dbe3a7bbed587700f
satok [Thu, 1 Dec 2011 01:39:12 +0000 (17:39 -0800)]
am
b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit '
b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
Fix ConcurrentModificationException in TextServicesManagerService
satok [Thu, 1 Dec 2011 01:37:52 +0000 (17:37 -0800)]
Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
Svetoslav Ganov [Thu, 1 Dec 2011 00:59:46 +0000 (16:59 -0800)]
am
d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
* commit '
d8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
Fixing memory leaks in the accessiiblity layer.
Svetoslav Ganov [Thu, 1 Dec 2011 00:56:41 +0000 (16:56 -0800)]
Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
Fabrice Di Meglio [Wed, 30 Nov 2011 23:58:49 +0000 (15:58 -0800)]
Merge "Improve TextLayoutCache logging"
Dianne Hackborn [Wed, 30 Nov 2011 22:18:59 +0000 (14:18 -0800)]
am
2fc9467e: am
88f10c6c: Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '
2fc9467e9a2ef1c22a0bc81cbcd2ced878dbdef7':
Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?
Dianne Hackborn [Wed, 30 Nov 2011 22:16:20 +0000 (14:16 -0800)]
am
a5b8883b: am
f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit '
a5b8883b0db9d6e129b88f003b541fafd829c77b':
Turn off debug log.
Dianne Hackborn [Wed, 30 Nov 2011 22:15:55 +0000 (14:15 -0800)]
am
88f10c6c: Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '
88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?
Romain Guy [Wed, 30 Nov 2011 22:13:49 +0000 (14:13 -0800)]
am
937925f5: am
7797cae2: Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
* commit '
937925f56952f015a7ee7ea91b29f60b8c631d9e':
Cache drawable constant states instead of drawables Bug #
5678369
Dianne Hackborn [Wed, 30 Nov 2011 22:13:42 +0000 (14:13 -0800)]
am
f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit '
f8d20bd6495883e98e23827a2e5ed03766fe483b':
Turn off debug log.
Dianne Hackborn [Wed, 30 Nov 2011 22:12:44 +0000 (14:12 -0800)]
Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
Dianne Hackborn [Wed, 30 Nov 2011 22:11:17 +0000 (14:11 -0800)]
Merge "Turn off debug log." into ics-mr1
Romain Guy [Wed, 30 Nov 2011 22:09:21 +0000 (14:09 -0800)]
am
7797cae2: Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
* commit '
7797cae2564eccf6d817b06d8116bd9cdc8e9ed4':
Cache drawable constant states instead of drawables Bug #
5678369
Romain Guy [Wed, 30 Nov 2011 22:07:34 +0000 (14:07 -0800)]
Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
Mathias Agopian [Wed, 30 Nov 2011 21:57:46 +0000 (13:57 -0800)]
am
e2970700: am
e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit '
e2970700e921da4226061988a6e8953b1fbfb5a9':
add a way to access the version string of the h/w implementation of EGL
Mathias Agopian [Wed, 30 Nov 2011 21:54:46 +0000 (13:54 -0800)]
am
e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit '
e8ba2aba934e3767d2081007bba93bad68566d22':
add a way to access the version string of the h/w implementation of EGL
David Brown [Wed, 30 Nov 2011 21:54:31 +0000 (13:54 -0800)]
Merge "Add support for country specific emergency number handling."
Mathias Agopian [Wed, 30 Nov 2011 21:52:21 +0000 (13:52 -0800)]
Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
The Android Open Source Project [Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)]
Reconcile with ics-mr1-release
Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
OSDN Git Service
