Nipun Kwatra
6cff3123d4
Merge "Added command type to play recording sound."
2010-09-14 17:48:02 -07:00
Vasu Nori
433a2af7e2
Merge "fix bugs in exception throwing code in native_fillwindow"
2010-09-14 16:40:24 -07:00
Vasu Nori
5fdec887ce
Merge "change TAG value from "Cursor" to "SQLiteCursor""
2010-09-14 16:04:26 -07:00
Jason Sams
64e113cb0c
Merge "Fix partial NP2 support and restrict mipmaps and clamp modes on HW that does not support proper NP2 bug 2965170"
2010-09-14 16:02:02 -07:00
Jaikumar Ganesh
7da40628e2
Merge "Rework Bluetooth tethering networking configuration."
2010-09-14 15:27:47 -07:00
Nipun Kwatra
2db10d6697
Merge "Adding enable/disable option for sendCommand()"
2010-09-14 15:15:16 -07:00
Adam Powell
f31bcfd4db
Merge "Improve ListView smooth scrolling timing"
2010-09-14 15:14:56 -07:00
Vasu Nori
9505d4d868
Merge "revert Change-Id: Ic610a0c38e7bd7c77006a08c7b82fa01957739e5"
2010-09-14 13:37:57 -07:00
Shimeng (Simon) Wang
bae67c69c7
Merge "Fix comment."
2010-09-14 13:37:37 -07:00
Jean-Baptiste Queru
8bb35e99d2
Merge "Manage fonts like a true product definition"
2010-09-14 13:17:18 -07:00
Alex Sakhartchouk
2ac4ace15e
Merge "Shader changes to allow for more flexible constant binding."
2010-09-14 11:39:53 -07:00
Maksymilian Osowski
be161d1f02
Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html"
2010-09-14 10:37:46 -07:00
Steve Block
b14bddabe6
Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2"
2010-09-14 10:21:30 -07:00
Maksymilian Osowski
0a7684fdbd
Merge "Made the run_layout_tests.py script restart the apache2 server before it starts."
2010-09-14 10:04:23 -07:00
Vasu Nori
c4cb303a49
Merge "sql statement with syntax errors can leave database lock in bad state"
2010-09-14 10:04:13 -07:00
Steve Block
84dbad060f
Merge "Sort LayoutTestController methods alphabetically"
2010-09-14 08:25:26 -07:00
Mike Lockwood
d54bb7441a
Merge changes I28b846a3,Ifd9b48cb
...
* changes:
MediaScanner: Fix problems with scanner non-file objects from the database
MTP: Delete all files and subdirectories when deleting directories.
2010-09-14 08:05:29 -07:00
Steve Block
23d4f894a4
Merge "Add to DumpRenderTree2 the option to suppress showing results in the host browser"
2010-09-14 06:27:08 -07:00
Maksymilian Osowski
bd0cf1883d
Merge "Gets rid of flickering when executing tests."
2010-09-14 06:24:08 -07:00
Dianne Hackborn
731a10b47f
resolved conflicts for merge of 6421ae7e to master
...
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
2010-09-13 21:41:57 -07:00
Dianne Hackborn
21ccd0138f
am 527c0283: am a0eb56ac: Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
...
Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202'
* commit '527c02838bed1188b9211752b4cf2fc0c03e8202':
Work on issue #2991868 : A toast pops up informing users...
2010-09-13 18:58:20 -07:00
Adam Powell
9af9929125
Merge "Fix bug 2995805 - splitMotionEvents behavior change"
2010-09-13 18:18:47 -07:00
Romain Guy
5d0be0adba
Merge "Document the implementation of saveLayer()."
2010-09-13 18:04:18 -07:00
Romain Guy
47bea6b023
Merge "Forgot the return value..."
2010-09-13 17:32:58 -07:00
Romain Guy
c90e6c2e28
Merge "Fix rendering issue with layers intersecting the clip rect."
2010-09-13 17:29:08 -07:00
Dianne Hackborn
47200f78a6
am 5251c800: Merge "Fix potential crash in sync." into gingerbread
...
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp
* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
Fix potential crash in sync.
2010-09-13 17:26:34 -07:00
Adam Powell
cca3431db6
am 59a29f4a: (-s ours) am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
...
Merge commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c'
* commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c':
DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 17:25:04 -07:00
Irfan Sheriff
b939b599e4
am b62bc963: am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
...
Merge commit 'b62bc9632250f77d29baca54419442c8d3c965ef'
* commit 'b62bc9632250f77d29baca54419442c8d3c965ef':
Fix statusbar display of wifi signalstrength
2010-09-13 17:24:49 -07:00
Dianne Hackborn
ac306f576b
Merge "Fix potential crash in sync." into gingerbread
2010-09-13 17:21:04 -07:00
Dianne Hackborn
6b6818ff62
am a0eb56ac: Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
...
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp
* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
Work on issue #2991868 : A toast pops up informing users...
2010-09-13 17:17:19 -07:00
Dianne Hackborn
fe460cc23a
Merge "Work on issue #2991868 : A toast pops up informing users..." into gingerbread
2010-09-13 17:14:00 -07:00
Dianne Hackborn
4a8ec516f0
resolved conflicts for merge of 53686433 to master
...
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Adam Powell
c87304626d
am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
...
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp
* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
2010-09-13 16:11:55 -07:00
Adam Powell
5828da75c4
Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread
2010-09-13 16:09:51 -07:00
Irfan Sheriff
cc5a76f9d6
am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread
...
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp
* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
Fix statusbar display of wifi signalstrength
2010-09-13 16:08:12 -07:00
Irfan Sheriff
6eedaf78bb
Merge "Fix statusbar display of wifi signalstrength" into gingerbread
2010-09-13 16:05:06 -07:00
Jaikumar Ganesh
9f5824410f
resolved conflicts for merge of 0522f5e9 to master
...
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
2010-09-13 14:57:59 -07:00
Shimeng (Simon) Wang
c999d8025e
am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread
...
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'
* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
DO NOT MERGE
2010-09-13 14:43:16 -07:00
Eric Laurent
632eb616a2
am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
...
Merge commit '4d9878502f7661ed34540a485a5942d859e209c7'
* commit '4d9878502f7661ed34540a485a5942d859e209c7':
Fix volume problems with insert revert
2010-09-13 14:42:59 -07:00
Dianne Hackborn
772eff388c
am 7e9f4eb2: Track client requests through location manager.
...
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp
* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Romain Guy
1b0ea17326
Merge "Forces windows to draw the first time they show."
2010-09-13 12:53:21 -07:00
Nipun Kwatra
aa23bf1487
Merge "Enabling time lapse in setProfile, added setCaptureRate"
2010-09-13 12:22:35 -07:00
Jaikumar Ganesh
350354e572
am cc5494c9: Out Of Band API for Secure Simple Pairing.
...
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp
* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
Out Of Band API for Secure Simple Pairing.
2010-09-13 11:52:19 -07:00
Shimeng (Simon) Wang
7be0c0b497
am fbd26467: Merge "DO NOT MERGE" into gingerbread
...
Merge commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64' into gingerbread-plus-aosp
* commit 'fbd2646705c52c111f041b16d7cb34cb922a2a64':
DO NOT MERGE
2010-09-13 11:51:55 -07:00
Eric Laurent
c2fad9102c
am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread
...
Merge commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a' into gingerbread-plus-aosp
* commit 'bd2e9ec64d9a292a1309504c6c5fe33e1bc2333a':
Fix volume problems with insert revert
2010-09-13 11:51:46 -07:00
Shimeng (Simon) Wang
c2d8c2434c
Merge "Accessibility support for WebViews"
2010-09-13 11:06:33 -07:00
Shimeng (Simon) Wang
0e152daec3
Merge "DO NOT MERGE" into gingerbread
2010-09-13 11:00:16 -07:00
Maksymilian Osowski
0af14d2141
Merge "Added overridePreference() layoutTestsController function."
2010-09-13 10:54:28 -07:00
Chris Palmer
8cb2c4f7c9
Merge "Correct the PackageManager.checkSignatures documentation."
2010-09-13 10:39:04 -07:00
Steve Block
e719ad633f
Merge "Update DumpRenderTree2 to only calculate the WebKit revision once per test run"
2010-09-13 10:29:36 -07:00