Kenny Root
82930f32bb
am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
...
* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
Fix free_cache to actually work
2011-12-01 14:16:18 -08:00
Kenny Root
c9fc27fd05
Merge "Fix free_cache to actually work" into ics-mr1
2011-12-01 14:14:22 -08:00
Roman Nurik
09d510a088
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.
2011-12-01 13:44:41 -08:00
Roman Nurik
b97464208e
am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
...
* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.
2011-12-01 13:42:23 -08:00
Roman Nurik
845715a005
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
2011-12-01 13:40:38 -08:00
Matthew Xie
89610203c3
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
2011-12-01 13:34:18 -08:00
Matthew Xie
3c418d0c7b
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
2011-12-01 13:32:19 -08:00
Svetoslav Ganov
de8f840dec
am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
...
* commit 'e9f24a43021734d28a4f65ebc804847b31ce13e8':
Fix memory leaks in the accessibility layer.
2011-12-01 12:59:11 -08:00
Svetoslav Ganov
314043ac17
Merge "Fix memory leaks in the accessibility layer." into ics-mr1
2011-12-01 12:57:12 -08:00
Dianne Hackborn
666666e5be
am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
...
* commit '55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
Improve how we manage the previous app.
2011-12-01 12:49:38 -08:00
Dianne Hackborn
7023e09efb
Merge "Improve how we manage the previous app." into ics-mr1
2011-12-01 12:47:43 -08:00
Daniel Sandler
36b576c94e
am b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
...
* commit 'b73dc9c852f73c7d61f317b5ec7b74766d2f22d5':
Add copious navigation bar info to SystemUI dumps.
2011-12-01 12:11:23 -08:00
Daniel Sandler
5ff5208408
Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
2011-12-01 12:09:51 -08:00
Bill Gruber
399bee8e6a
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
2011-12-01 11:56:55 -08:00
Scott Main
fee5270baf
am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
...
* commit 'a8fa89f7f4e658c41dba466b10459208d673bc3a':
docs: dashboard update for 12/1
2011-12-01 11:56:54 -08:00
Bill Gruber
1f3bce972e
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
2011-12-01 11:54:57 -08:00
Scott Main
d4d0d73790
am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
...
* commit '8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1
2011-12-01 11:54:55 -08:00
Bill Gruber
867b9e3392
Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
2011-12-01 11:53:23 -08:00
Scott Main
dc18c92fa8
Merge "docs: dashboard update for 12/1" into ics-mr0
2011-12-01 11:53:17 -08:00
Amith Yamasani
cb79af80ec
am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
...
* commit 'e9b0608c76bd19356f3141358ffdf134b7a9700f':
No clicking on volume icon in volume dialog.
2011-12-01 11:37:32 -08:00
Amith Yamasani
6f5f57a827
Merge "No clicking on volume icon in volume dialog." into ics-mr1
2011-12-01 11:35:30 -08:00
Scott Main
e4ff2334e5
am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178
...
* commit '4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
docs: remove broken link from renderscript docs bug: 5696178
2011-12-01 11:23:15 -08:00
Scott Main
28dd6b3c7b
am acf1038a: docs: remove broken link from renderscript docs bug: 5696178
...
* commit 'acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug: 5696178
2011-12-01 11:20:03 -08:00
Gilles Debunne
f6d23c3af9
am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1
...
* commit '0433c157141b9122f6c61498e909770f1db27c7c':
TextViews keep focus after Done
2011-12-01 10:24:23 -08:00
Gilles Debunne
fd55ac0009
am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
...
* commit 'b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
Revert "IME action (done, next...) correctly handled"
2011-12-01 10:24:21 -08:00
Gilles Debunne
e3d12016b4
Merge "TextViews keep focus after Done" into ics-mr1
2011-12-01 10:22:15 -08:00
Gilles Debunne
fb3064556e
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
2011-12-01 10:21:59 -08:00
Andreas Huber
52395b1e29
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
2011-12-01 10:20:09 -08:00
Andreas Huber
8adebc7d05
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
2011-12-01 10:18:19 -08:00
Robert Greenwalt
ec92962c06
am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
...
* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
Fix state synchronization problem.
2011-12-01 09:44:12 -08:00
Robert Greenwalt
70e320c37d
Merge "Fix state synchronization problem." into ics-mr1
2011-12-01 09:42:13 -08:00
Ben Murdoch
495cbc6669
am 90ea4c4d: Merge "Fix crash with HTML5 video." into ics-mr1
...
* commit '90ea4c4d30ccafb51e024ab3c34a4655d06eec4c':
Fix crash with HTML5 video.
2011-12-01 09:05:55 -08:00
Ben Murdoch
670acec923
Merge "Fix crash with HTML5 video." into ics-mr1
2011-12-01 09:03:22 -08:00
Daniel Sandler
f2e05f1750
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.
2011-12-01 06:31:09 -08:00
Daniel Sandler
859cdf2328
Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
2011-12-01 06:29:53 -08:00
Bart Sears
9d735cbfd6
am 41a5774a: Merge "fix position of WebTextView on scrolling layers" into ics-mr1
...
* commit '41a5774a99215025628b83db54c45f84b876678e':
fix position of WebTextView on scrolling layers
2011-11-30 22:31:08 -08:00
Bart Sears
5b74fe7ca1
Merge "fix position of WebTextView on scrolling layers" into ics-mr1
2011-11-30 22:29:16 -08:00
Adam Cohen
a5bc14b4f5
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)
2011-11-30 21:13:04 -08:00
Adam Cohen
c3003b601d
Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1
2011-11-30 21:10:27 -08:00
Dianne Hackborn
e80305872e
am a1240184: Merge "Fix issue #5433192 and maybe #5433192 " into ics-mr1
...
* commit 'a1240184efd1d4391540a6e3e9cae50d56d05cb2':
Fix issue #5433192 and maybe #5433192
2011-11-30 20:50:57 -08:00
Dianne Hackborn
dfcc7b62f5
Merge "Fix issue #5433192 and maybe #5433192 " into ics-mr1
2011-11-30 20:49:21 -08:00
satok
e2dcd7f0fe
am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
...
* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
Fix ConcurrentModificationException in TextServicesManagerService
2011-11-30 17:39:12 -08:00
satok
cc4f36dfc8
Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
2011-11-30 17:37:52 -08:00
Svetoslav Ganov
bd8b845e62
am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
...
* commit 'd8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
Fixing memory leaks in the accessiiblity layer.
2011-11-30 16:59:46 -08:00
Svetoslav Ganov
efe11185b5
Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
2011-11-30 16:56:41 -08:00
Dianne Hackborn
acfa87eeb1
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?
2011-11-30 14:15:55 -08:00
Dianne Hackborn
e40e39ddfd
am f8d20bd6: Merge "Turn off debug log." into ics-mr1
...
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
Turn off debug log.
2011-11-30 14:13:42 -08:00
Dianne Hackborn
ea402a7e8c
Merge "Fix issue #5679504 : Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
2011-11-30 14:12:44 -08:00
Dianne Hackborn
5703b2516a
Merge "Turn off debug log." into ics-mr1
2011-11-30 14:11:17 -08:00
Romain Guy
6a15b74f03
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
2011-11-30 14:09:21 -08:00