Huahui Wu
2b7cd684b3
Merge "b/3347670 Support installing online certs to the system keystore." into honeycomb
2011-01-27 13:26:27 -08:00
Vasu Nori
896627d7f4
Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
2011-01-27 12:46:00 -08:00
Daniel Sandler
1a1f0cb7f2
Merge "Correct the translationY of the empty notification panel." into honeycomb
2011-01-27 11:11:37 -08:00
Gilles Debunne
268011b2d0
Merge "CustomSelectionActionModeCallback can prevent selection mode from starting." into honeycomb
2011-01-27 11:07:16 -08:00
Gilles Debunne
3ea2c65f6c
Merge "Refresh the list of preloaded drawables and color state lists" into honeycomb
2011-01-27 11:07:04 -08:00
Irfan Sheriff
891ef2d5d1
Merge "Fix the build"
2011-01-27 11:05:04 -08:00
Chet Haase
9452a5c5f1
Merge "Fix NPE with display lists when view not attached" into honeycomb
2011-01-27 10:41:26 -08:00
Gil Dobjanschi
a9b2d738ef
am 0966fb9e: am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
* commit '0966fb9e73345b1e5ea9464e77beed07378edd6a':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
2011-01-27 10:36:33 -08:00
Gil Dobjanschi
f8d16a172a
am eea200a9: Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
...
* commit 'eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5':
Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
2011-01-27 10:34:39 -08:00
Dirk Dougherty
3896abda38
am 1aa79d4b: am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
...
* commit '1aa79d4b5c2f12aa3a9ddabbdd679cd3f21a1476':
Doc change: fix adt archive filename.
2011-01-27 10:13:18 -08:00
Dirk Dougherty
c4d002d769
am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.
...
* commit 'd1ca9aa561337dd294b8ae137f54b182372e69fb':
Doc change: fix adt archive filename.
2011-01-27 10:10:49 -08:00
Dirk Dougherty
d6684a41c0
am 591a5f86: Doc change: fix adt archive filename.
...
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
Doc change: fix adt archive filename.
2011-01-27 10:08:09 -08:00
Justin Ho
5217aea315
am 3f047aee: am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
...
* commit '3f047aeed0281853141172cdf4ea8b74bd7b85b4':
Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
2011-01-27 08:11:05 -08:00
Justin Ho
05eddc0a97
am bbc1d355: Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
...
* commit 'bbc1d355f8f9b9908bd152125a42c3d890a12d63':
Updated stat_sys for battery and bluetooth and USB in hdpi, mdpi and xlarge-hdpi
2011-01-27 07:58:01 -08:00
Chet Haase
e7b0cdbf32
am cd88c39b: am e38ba4ac: Fix gmail crossfade artifacts.
...
* commit 'cd88c39b989fc927016aa8d1c3794b872519d575':
Fix gmail crossfade artifacts.
2011-01-27 01:32:44 -08:00
Chet Haase
3d162e338a
am e38ba4ac: Fix gmail crossfade artifacts.
...
* commit 'e38ba4acbe6f1536997ffb98d662fc3eff07add8':
Fix gmail crossfade artifacts.
2011-01-27 01:30:09 -08:00
Jeff Brown
90b058a853
am 9d925d2d: am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
...
* commit '9d925d2dfdb2a0bd89ff081c1693129f3bf85e77':
Handle ActivityNotFoundException in the WM policy.
2011-01-26 23:58:10 -08:00
Chet Haase
81fc954611
am fcf51a67: am a45c056e: Merge "Fix display List bugs" into honeycomb
...
* commit 'fcf51a67967a402bf2178c3d0e09828e8942cade':
Fix display List bugs
2011-01-26 23:55:50 -08:00
Jeff Brown
4f33a6522a
am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
...
* commit 'da910fd5ea024f214f806d880d86d77bf94497b5':
Handle ActivityNotFoundException in the WM policy.
2011-01-26 23:54:16 -08:00
Jeff Brown
8d5e5c68af
Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
2011-01-26 23:52:41 -08:00
Chet Haase
a6a598d994
am a45c056e: Merge "Fix display List bugs" into honeycomb
...
* commit 'a45c056e62be0ca97edbdd6f6660822cf453c886':
Fix display List bugs
2011-01-26 23:51:58 -08:00
Jeff Brown
a5fab84d16
am b43610f8: am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
...
* commit 'b43610f8c9994163a1b69d23ac893de3f80a5355':
Fix down arrow in AutoCompleteTextView.
2011-01-26 23:51:36 -08:00
Jeff Brown
6fdb1605b7
am f02853f2: Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
...
* commit 'f02853f211f0b7f698f82305e30c23e527192584':
Fix down arrow in AutoCompleteTextView.
2011-01-26 23:49:41 -08:00
Chet Haase
2bc4959ab5
Merge "Fix display List bugs" into honeycomb
2011-01-26 23:49:23 -08:00
Vasu Nori
b4e1221611
am 7489a470: am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
...
* commit '7489a4709daf39aff61a17818de282d9ca4dc7c8':
bug:3396894 (HC branch) remove STOPSHIP code
2011-01-26 23:47:22 -08:00
Jeff Brown
9cb396a153
Merge "Fix down arrow in AutoCompleteTextView." into honeycomb
2011-01-26 23:45:59 -08:00
Vasu Nori
895f6e2c32
am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
...
* commit 'd529d0df8f2e93e0dc74887ab43eff46e07cef2e':
bug:3396894 (HC branch) remove STOPSHIP code
2011-01-26 23:45:27 -08:00
Vasu Nori
e1b06e72a7
Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb
2011-01-26 23:43:17 -08:00
Svetoslav Ganov
21a1750e34
am a7477f6b: am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
...
* commit 'a7477f6b1c2222bc2cc71416cad108adc0b6f0a3':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
2011-01-26 23:03:01 -08:00
Svetoslav Ganov
371744de71
am c291a7bf: Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
...
* commit 'c291a7bf7a163cea10be135279103f72a6418383':
The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week.
2011-01-26 23:01:03 -08:00
Svetoslav Ganov
0f0eac818f
Merge "The calendar view widget was jumping incorrectly to the next week while selectiong the last day of the week." into honeycomb
2011-01-26 22:59:23 -08:00
Basavapatna Dattaguru
ac2e3007d9
am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
...
* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
Revert "Video editor CTS: Framework modifications"
2011-01-26 22:54:41 -08:00
Basavapatna Dattaguru
e095e5351f
am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
...
* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
Revert "Fixes Issue ID: 3396697"
2011-01-26 22:54:37 -08:00
Basavapatna Dattaguru
19979c298b
am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
...
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
Revert "Video editor CTS: Framework modifications"
2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
46cbdcf03d
am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
...
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
Revert "Fixes Issue ID: 3396697"
2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
5d53a1a084
Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb
2011-01-26 22:50:59 -08:00
Basavapatna Dattaguru
4bdc5673cc
Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb
2011-01-26 22:50:50 -08:00
Romain Guy
c1e575a033
am 38f34ed2: am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '38f34ed20a52d027cbf1b72fe22c6d616810613b':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:49:13 -08:00
Romain Guy
73843d234d
am 7c53a0d6: Merge "Don\'t draw the same triangles several times. Bug #3388197 " into honeycomb
...
* commit '7c53a0d6078620df3abc4997acfe267ef903f5c6':
Don't draw the same triangles several times. Bug #3388197
2011-01-26 22:47:01 -08:00
Adam Cohen
bc46e96aa3
am a05a3e3a: am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
...
* commit 'a05a3e3ad7fbb27d1629836141e9d52937299bda':
Fixing some ugly StackView relayouts on rotation
2011-01-26 22:46:57 -08:00
Adam Cohen
b30fcd220e
am 3b52ca3b: Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
...
* commit '3b52ca3bbcb989200abff5582ef569d5f316d7f5':
Fixing some ugly StackView relayouts on rotation
2011-01-26 22:44:53 -08:00
Romain Guy
bd86097d8c
Merge "Don't draw the same triangles several times. Bug #3388197 " into honeycomb
2011-01-26 22:44:02 -08:00
Adam Cohen
c1e797065b
Merge "Fixing some ugly StackView relayouts on rotation" into honeycomb
2011-01-26 22:41:43 -08:00
Joe Onorato
b7071faee0
am 7c77bd0e: am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit '7c77bd0e3dda93242e7dbcfb4754817894483653':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:26:15 -08:00
Joe Onorato
b3caedfa76
am e193c468: Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
...
* commit 'e193c4688f9062e1d4dba97413788b6ffa122a55':
Fix 3388705: Explicitly check for low battery level
2011-01-26 22:23:56 -08:00
Joe Onorato
b44ba5fe26
Merge "Fix 3388705: Explicitly check for low battery level" into honeycomb
2011-01-26 22:21:26 -08:00
Joe Onorato
d036a4398a
am 5702e88b: am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit '5702e88b7f7fa72acfe9a34bffde54f578b1a94a':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:04:41 -08:00
Joe Onorato
48edeff1fd
am ea1fbe9c: Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
...
* commit 'ea1fbe9c8c9fe32690252dcc4dc96c93ae03f686':
Revert "getRingtone is causing an anr. Turn it off for now."
2011-01-26 22:02:18 -08:00
Joe Onorato
d62cc7b256
Merge "Revert "getRingtone is causing an anr. Turn it off for now."" into honeycomb
2011-01-26 22:00:07 -08:00
Basavapatna Dattaguru
b53541f18d
am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb
...
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
Video editor CTS: Framework modifications
2011-01-26 21:54:16 -08:00