John Reck
3be5902930
Merge "Send correct cookies for HTML5 video when incognito"
2011-03-01 15:07:39 -08:00
Romain Guy
c0dd743863
Merge "Correctly mark layers dirty when drawing WebView."
2011-03-01 14:53:48 -08:00
Eric Fischer
6c0a5000f6
am 86b7a597: Import revised translations. DO NOT MERGE
...
* commit '86b7a59726010e0952b0ede4fd40d933aeb83384':
Import revised translations. DO NOT MERGE
2011-03-01 14:41:39 -08:00
Jamie Gennis
ea72db3737
Merge "Add the MIN_UNDEQUEUED_BUFFERS query to ANW."
2011-03-01 14:38:20 -08:00
Dianne Hackborn
4a89a5e13e
Merge "Fix Issue 14340: Sticky Service killed with onDestroy not called, not restarted."
2011-03-01 14:36:12 -08:00
Romain Guy
976c89c19f
Merge "Avoid UTF-8 conversions and string copies whenever possible."
2011-03-01 14:28:13 -08:00
Mathias Agopian
acd116daea
Add support for up to 32 buffers per Surface
...
Bug: 3488016
Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
2011-03-01 14:09:06 -08:00
Gilles Debunne
173f177ea8
Merge "AbsListView notifies scroll events to the ViewTreeObserver."
2011-03-01 13:55:16 -08:00
Costin Manolache
fbbb4a338e
am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 13:28:03 -08:00
Kristian Monsen
d29000cc0b
Merge "Part of fix for bug 3489551 Browser doesn't send cookies for HTML5 video in incognito"
2011-03-01 13:12:24 -08:00
Derek Sollenberger
5bee142a7a
Merge "Don't update webkit at every stage of a zoom animation."
2011-03-01 12:58:31 -08:00
Fred Quintana
27ecc3bffb
Merge "Fix a deadlock in AccountManagerService cause by different paths of code getting the mCacheLock and DB locks in different orders."
2011-03-01 12:30:06 -08:00
Costin Manolache
a880e1e731
am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
...
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
2011-03-01 12:29:40 -08:00
Costin Manolache
a9869cf37b
Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
2011-03-01 12:25:21 -08:00
Santosh Madhava
b3382cc23e
Merge "Fix for issue 3431967: Memory leak from video editor engine"
2011-03-01 12:04:12 -08:00
Mike Lockwood
86d2fee005
Merge "UsbDeviceSettingsManager: don't write settings file when not necessary"
2011-03-01 12:00:09 -08:00
Mike Lockwood
416a44a9bd
Merge "Fix UsbDeviceSettingsManager locking."
2011-03-01 11:59:32 -08:00
Mike Lockwood
4e5f5427e2
Merge "Move USB framework support from android.hardware to android.hardware.usb package"
2011-03-01 11:58:22 -08:00
Eric Laurent
09fce23a7e
Merge "Fix issue 3479042."
2011-03-01 11:46:15 -08:00
Jamie Gennis
30365befce
Merge "Stagefright: Query buffer usage from the component."
2011-03-01 11:41:29 -08:00
Irfan Sheriff
82a1291b20
Merge "Using AsyncChannel for wifi connectivity"
2011-03-01 11:32:24 -08:00
Dianne Hackborn
20cad7c563
am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."
...
* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
Fix leak when keylock is recreated.
2011-03-01 11:13:14 -08:00
Jaikumar Ganesh
710fb0bb55
am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT."
...
* commit '516393faba128ce43bee98b6319e060744fe7be6':
Phone crash when old callback func is woken up when enabling BT.
2011-03-01 11:12:56 -08:00
Eric Fischer
56c065d4c5
Merge "Import revised translations."
2011-03-01 11:11:24 -08:00
Mike Corrigan
a7d25a312f
am bd15112a: Fix the display priority of the airplane mode icon.
...
* commit 'bd15112a29eefb93e62235574b694746044c9261':
Fix the display priority of the airplane mode icon.
2011-03-01 11:08:45 -08:00
Mike Lockwood
fab7422d8d
am 5d019f0e: (-s ours) am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
...
* commit '5d019f0e6d57cdd633aa976a8a0f221941afd343':
UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 10:59:00 -08:00
Mike Lockwood
90ed0ea8a0
am 3fa12d45: (-s ours) am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
...
* commit '3fa12d459d16fb1d3d06b6c68b201340c9d3afcd':
DO NOT MERGE: Clean up USB notifications:
2011-03-01 10:58:56 -08:00
Mike Lockwood
bab78807eb
am 91dceb81: (-s ours) am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
...
* commit '91dceb8143c9dab6b9b0ad38b5a3d7bb0586c677':
DO NOT MERGE UsbManager: squashed commit of:
2011-03-01 10:58:52 -08:00
Mike Lockwood
73cc000814
am 8697f397: (-s ours) am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
...
* commit '8697f397e29cdfb90f84fab584eff9edc2b0dc6f':
Give system server permission to access USB. DO NOT MERGE
2011-03-01 10:58:49 -08:00
Xavier Ducrohet
e9265b771d
am 2d5ed079: (-s ours) am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
...
* commit '2d5ed07940bc1966d4b55999634f05515e7fe197':
Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 10:58:45 -08:00
Wink Saville
aabf253e34
am 23fe0059: (-s ours) am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb
...
* commit '23fe005900aab2955052e0c9dc36ca05ea351a1a':
Fixing the write of BackgroundData setting, DO NOT MERGE.
2011-03-01 10:58:05 -08:00
Gilles Debunne
187d75a138
Merge "Removed ViewTreeObserver null checks"
2011-03-01 10:50:00 -08:00
Gilles Debunne
33fca21e8a
Merge "Scrollable tabs are correctly displayed."
2011-03-01 10:49:23 -08:00
Adam Powell
ef160cb2ad
Merge "Fix a bug where the lazy-initialized ActionBar object was being too lazy."
2011-03-01 10:46:42 -08:00
Eric Rowe
a23b7610b0
Merge "Add test cases for AudioManager SCO methods."
2011-03-01 10:31:26 -08:00
Jamie Gennis
4f87e98c01
Merge "Add an OMX IL API for querying buffer usage flags."
2011-03-01 10:25:38 -08:00
Jamie Gennis
0487b2a20a
Merge "Fix error recovery in Stagefright init."
2011-03-01 10:24:55 -08:00
Mike Lockwood
8c18b5f38b
am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread
...
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
UsbService: Remove stack-trace message during boot. DO NOT MERGE
2011-03-01 09:12:49 -08:00
Mike Lockwood
bcf65037d2
am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread
...
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
DO NOT MERGE: Clean up USB notifications:
2011-03-01 09:12:45 -08:00
Mike Lockwood
dd4af71b98
am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread
...
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
DO NOT MERGE UsbManager: squashed commit of:
2011-03-01 09:12:31 -08:00
Mike Lockwood
879ff09c2a
am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread
...
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
Give system server permission to access USB. DO NOT MERGE
2011-03-01 09:12:27 -08:00
Xavier Ducrohet
f2ac085586
am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread
...
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
Merge 1911a6f7 into gingerbread. do not merge.
2011-03-01 09:12:15 -08:00
Chet Haase
e831c48cd2
Merge "Cleanup of docs for ViewPropertyAnimator class"
2011-03-01 07:41:42 -08:00
Eric Fischer
3222ef69a9
am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
Import revised translations. DO NOT MERGE
2011-02-28 22:23:03 -08:00
Irfan Sheriff
ba1fced257
am 5af7cf7c: am f9e2a491: Fix issue to clear scan alarms
...
* commit '5af7cf7c558e6febfa5d48b62900929743d2f7bb':
Fix issue to clear scan alarms
2011-02-28 22:22:37 -08:00
Adam Powell
6bd3b705b6
Merge "Fix bug 3497341 - take list padding into account when drawing ExpandableListView indicators"
2011-02-28 22:01:31 -08:00
Adam Powell
eff8575b70
Merge "Fix bug 3497307 - Fix issues with FEATURE_ACTION_MODE_OVERLAY"
2011-02-28 21:49:40 -08:00
Christopher Tate
d391311913
Merge "Make sure to properly default the screen size during wallpaper restore"
2011-02-28 19:37:06 -08:00
Xavier Ducrohet
430a5a0b0c
Merge "Add notice files for aapt and aidl."
2011-02-28 19:19:23 -08:00
Daniel Sandler
5dc9fc2a53
Merge "resolved conflicts for merge of cfeaa492 to master"
2011-02-28 18:38:02 -08:00