OSDN Git Service
Bill Gruber [Thu, 1 Dec 2011 20:44:30 +0000 (12:44 -0800)]
am
9b188ea2: 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 '
9b188ea2b74e749eef19fcb67feaca77e09f1cde':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug
5221766
Scott Main [Thu, 1 Dec 2011 20:44:28 +0000 (12:44 -0800)]
am
f434ad0f: am
42e4ecc7: am
a8fa89f7: am
8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
* commit '
f434ad0fe224756aa5984fe5e829b0c333bbe9e3':
docs: dashboard update for 12/1
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:20:36 +0000 (12:20 -0800)]
am
41995689: am
52976f04: am
e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
* commit '
41995689f26dc44be9628bb81e9448d067d66fff':
No clicking on volume icon in volume dialog.
Scott Main [Thu, 1 Dec 2011 20:20:33 +0000 (12:20 -0800)]
am
67592fad: am
075bd9eb: am
4f926932: am
acf1038a: docs: remove broken link from renderscript docs bug:
5696178
* commit '
67592fad192f6988cbeeb56052ee1d2e1ef3e38f':
docs: remove broken link from renderscript docs bug:
5696178
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
Gilles Debunne [Thu, 1 Dec 2011 20:01:21 +0000 (12:01 -0800)]
am
6bb5fc57: am
4fec974c: am
0433c157: Merge "TextViews keep focus after Done" into ics-mr1
* commit '
6bb5fc577d326cfef5b7b15457ef145118e2e904':
TextViews keep focus after Done
Gilles Debunne [Thu, 1 Dec 2011 20:01:19 +0000 (12:01 -0800)]
am
ad79297a: am
d732efa2: am
b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
* commit '
ad79297a4118e73e7828f08545963e9795407df1':
Revert "IME action (done, next...) correctly handled"
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:37:53 +0000 (10:37 -0800)]
am
de5b3a09: Merge "Protect code in ViewPropertyAnimator from potential null deref"
* commit '
de5b3a0933e17218f75ec42a244f482f7ead2d37':
Protect code in ViewPropertyAnimator from potential null deref
Chet Haase [Thu, 1 Dec 2011 18:35:18 +0000 (10:35 -0800)]
Merge "Protect code in ViewPropertyAnimator from potential null deref"
Andreas Huber [Thu, 1 Dec 2011 18:25:52 +0000 (10:25 -0800)]
am
f8ebb32d: am
10526a0b: am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
f8ebb32d1fa8fc521f47d83ffa77e20ded066c45':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
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:48:11 +0000 (09:48 -0800)]
am
89b26299: am
c8e643a8: am
22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
* commit '
89b262990fc82b1b928519744b1640ead406f110':
Fix state synchronization problem.
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:10:06 +0000 (09:10 -0800)]
am
9c8fc9c6: am
fc00b6aa: am
90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
* commit '
9c8fc9c62015382a9369f983a7ac6c655d9bbaaf':
Fix crash with HTML5 video.
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:35:34 +0000 (06:35 -0800)]
am
d2a28b3e: am
859bc015: (-s ours) am
2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '
d2a28b3ee07e27cc374d07b02995fb865474aae7':
Put screensavers back in the icebox for now. DO NOT MERGE.
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:35:28 +0000 (22:35 -0800)]
am
51340e0f: am
5a4e807a: am
41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
* commit '
51340e0fb74a11885b667dc16c9d21a9199211c9':
fix position of WebTextView on scrolling layers
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:16:54 +0000 (21:16 -0800)]
am
bd573a38: am
2a163f61: am
557a1772: Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)" into ics-mr1
* commit '
bd573a38133f7f2de1e34d57f726a4538e8cfcc5':
Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug
5640357)
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:55:42 +0000 (20:55 -0800)]
am
4d774e0a: am
f5fd08d6: am
a1240184: Merge "Fix issue #
5433192 and maybe #
5433192" into ics-mr1
* commit '
4d774e0ac274e2a1c2a65a9dedfb336c95879f05':
Fix issue #
5433192 and maybe #
5433192
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:24:15 +0000 (20:24 -0800)]
am
500053f8: Merge "Optimize away unnecessary state changes"
* commit '
500053f8e8e56050c9221d9020a71e6672c810f1':
Optimize away unnecessary state changes
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:11:50 +0000 (20:11 -0800)]
am
a791894f: Merge "TextLayoutCache Code cleaning"
* commit '
a791894f8c443bcccfd76d76034a3df46879e192':
TextLayoutCache Code cleaning
Fabrice Di Meglio [Thu, 1 Dec 2011 04:09:57 +0000 (20:09 -0800)]
Merge "TextLayoutCache Code cleaning"
Svetoslav Ganov [Thu, 1 Dec 2011 03:38:31 +0000 (19:38 -0800)]
am
786e54dd: Fixing the build
* commit '
786e54dd13111b6a2f75f4f37dd20353cf613e97':
Fixing the build
Svetoslav Ganov [Thu, 1 Dec 2011 03:20:55 +0000 (19:20 -0800)]
am
66922db8: Fixing the build - for real
* commit '
66922db828eab153c15bf3ca0b007313d9376e5e':
Fixing the build - for real
Svetoslav Ganov [Thu, 1 Dec 2011 03:20:53 +0000 (19:20 -0800)]
am
8b5a814f: Fixing the build
* commit '
8b5a814f6a36045b06bee36f44703503c03714d4':
Fixing the build
satok [Thu, 1 Dec 2011 02:44:34 +0000 (18:44 -0800)]
am
36d1bbe6: am
b7dda6d3: am
b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit '
36d1bbe6063a9a723fe25ea0f3c6e6dd11d6bf37':
Fix ConcurrentModificationException in TextServicesManagerService
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:41:58 +0000 (18:41 -0800)]
am
f3b4f316: resolved conflicts for merge of
26f7a81f to master
* commit '
f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7':
Fixing memory leaks in the accessiiblity layer.
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 [Thu, 1 Dec 2011 00:01:28 +0000 (16:01 -0800)]
am
a90d6526: Merge "Improve TextLayoutCache logging"
* commit '
a90d65265fe94e35967876500105d6e020ce0f91':
Improve TextLayoutCache logging
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:21:10 +0000 (14:21 -0800)]
am
f11fd272: am
2fc9467e: am
88f10c6c: Merge "Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '
f11fd2724fc075ebc7b0d996615d7101f220820e':
Fix issue #
5679504: Device stuck and sudden reboot - Watchdog reset?
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:18:51 +0000 (14:18 -0800)]
am
dd07aa07: am
a5b8883b: am
f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit '
dd07aa072f0e8498e47956c26fa43a91c7835337':
Turn off debug log.
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.
Romain Guy [Wed, 30 Nov 2011 22:16:20 +0000 (14:16 -0800)]
am
15540f82: am
937925f5: am
7797cae2: Merge "Cache drawable constant states instead of drawables Bug #
5678369" into ics-mr1
* commit '
15540f8284b2f9a66ebeb28d441e1cde7423c41d':
Cache drawable constant states instead of drawables Bug #
5678369
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 22:05:31 +0000 (14:05 -0800)]
am
b665687a: am
e2970700: am
e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit '
b665687a55eef67397115188a5ed76c53b267403':
add a way to access the version string of the h/w implementation of EGL
David Brown [Wed, 30 Nov 2011 22:05:28 +0000 (14:05 -0800)]
am
f40e91c7: Merge "Add support for country specific emergency number handling."
* commit '
f40e91c77ef32578554ced2ae28b585cf8e7f876':
Add support for country specific emergency number handling.
The Android Open Source Project [Wed, 30 Nov 2011 22:05:12 +0000 (14:05 -0800)]
am
d96452e0: Reconcile with ics-mr1-release
* commit '
d96452e04e6691f3b36d94f6b81b1519a8fff826':
Daniel Sandler [Wed, 30 Nov 2011 22:04:12 +0000 (14:04 -0800)]
am
b2b0d91d: am
7413d49b: am
865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1
* commit '
b2b0d91d34355839adc87687a02710951565bd6a':
Expanding NotificationManager's event logging.
Jeff Sharkey [Wed, 30 Nov 2011 22:04:03 +0000 (14:04 -0800)]
am
28147b65: am
827eed06: am
47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1
* commit '
28147b654bba8ae2b7976e58aa7869255e436b0b':
Avoid airplane mode labels when Wi-Fi enabled.
Svetoslav Ganov [Wed, 30 Nov 2011 22:03:27 +0000 (14:03 -0800)]
am
ddd51fdb: am
4661a05b: am
2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1
* commit '
ddd51fdb7117a6a0812968a47b43067d3d899991':
NumberPicker incorrectly shown for the old theme.
Dianne Hackborn [Wed, 30 Nov 2011 22:03:25 +0000 (14:03 -0800)]
am
27a7b136: am
9c83b6ff: am
db904b47: Merge "Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
* commit '
27a7b136661d0e829a06361deb72a4ef41040681':
Fix issue #
5628789: Cannot set static/custom wallpaper after clearing Settings data
Narayan Kamath [Wed, 30 Nov 2011 22:03:22 +0000 (14:03 -0800)]
am
4f9787d6: am
7dfb3e61: am
cc084f1d: Fix superfluous onError callbacks.
* commit '
4f9787d6f4058a0f6df08456119edd2ae1b546cd':
Fix superfluous onError callbacks.
Mathias Agopian [Wed, 30 Nov 2011 22:03:15 +0000 (14:03 -0800)]
am
993b2099: am
55d3880e: am
bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
* commit '
993b2099cee5c3ad86a5fbbd29194994336187be':
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
Jamie Gennis [Wed, 30 Nov 2011 22:03:13 +0000 (14:03 -0800)]
am
df96385b: am
c040e1e7: am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
df96385b9acf9ec74c62edc34ffa9c8d9dae1c03':
SurfaceMediaSource: use the vid enc usage bit
Chris Craik [Wed, 30 Nov 2011 22:03:11 +0000 (14:03 -0800)]
am
267a4b06: am
c649180d: am
f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
* commit '
267a4b0627f98b020725e860b0a3c128067131b1':
Send animation start notification back to webkit from ui thread
Jeff Sharkey [Wed, 30 Nov 2011 22:03:04 +0000 (14:03 -0800)]
am
cf5b90b4: Merge "Clean up InterfaceConfiguration flags."
* commit '
cf5b90b45cbfe994661f2087fedc9aee80e95763':
Clean up InterfaceConfiguration flags.
Steve Block [Wed, 30 Nov 2011 22:03:00 +0000 (14:03 -0800)]
am
6a8c48f6: Merge "Clean up JavaDoc for GeolocationPermissions"
* commit '
6a8c48f6aaead268a517573d7cd0199ee5677a52':
Clean up JavaDoc for GeolocationPermissions
Dianne Hackborn [Wed, 30 Nov 2011 22:02:39 +0000 (14:02 -0800)]
am
ed032e78: am
500862b4: am
1808f214: Merge "Fix issue #
5636525: ANR observed in setup wizard after changing language" into ics-mr1
* commit '
ed032e78733afab4bf49d80da1a38fb06bf99622':
Fix issue #
5636525: ANR observed in setup wizard after changing language
Teng-Hui Zhu [Wed, 30 Nov 2011 22:02:37 +0000 (14:02 -0800)]
am
0e9f0c3e: am
e9dc400c: am
d3788b97: Merge "WebView animation support" into ics-mr1
* commit '
0e9f0c3e13d49a044835a05cf514b9f81dd7b28a':
WebView animation support
OSDN Git Service
