Merge commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba' into kraken
* commit '4c93207940aa70b3f777fe14dce1bf580e1b71ba':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit '11fb6144604fbd1148695421e9ab6896701a431b' into froyo-plus-aosp
* commit '11fb6144604fbd1148695421e9ab6896701a431b':
Match RFC requirement that the domain portion of a cookie should be case-insensitive.
Merge commit 'd12d6c305caeea556781083152e741bdb3863eff' into kraken
* commit 'd12d6c305caeea556781083152e741bdb3863eff':
Public API changes for CameraProfile and CamcorderProfile classes
Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp
* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
Public API changes for CameraProfile and CamcorderProfile classes
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken
* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
Fix for bug 2558156: Encodig is null
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug 2558156: Encodig is null
This does not actually pass the test since the test has wrong expectations, but it is at least doing the right thing.
Change-Id: I7da29a3f101647bb628805514cf2bdef24864e50
Fixes DumpRenderTree to re-use HTTP authentication credentials
This is required for layout test http/tests/appcache/auth.html
Bug: 2098423
Change-Id: Ic9531e3c23a2fa9ebfab70cde3172550f572a404
Merge commit 'fe72c533fe210e147111e0a862360032365dd987' into kraken
* commit 'fe72c533fe210e147111e0a862360032365dd987':
As we don't support over scroll any more, we need
This change forwards to the WebView HTTP authentication credentials that
are supplied to an XHR from JavaScript. This allows the WebView to store these
credentials for use with later requests.
This is a re-working of https://android-git.corp.google.com/g/46430
Bug: 2544330
Change-Id: I3f04433b00233d7b7bf4f7e3471d8d15d8817f93
Merge commit '461cef5d209fd072c82f6a70eb106e4690b7ef97' into froyo-plus-aosp
* commit '461cef5d209fd072c82f6a70eb106e4690b7ef97':
As we don't support over scroll any more, we need
1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final”
2. CamcorderProfile.Quality: use an int rather than an enum
3. Add API on MediaRecorder to pass in a CamcorderProfile
4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile
5. Remove a convenient method and instead let the (mms) app do that task
bug - 2553862
Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken
* commit '6ff57ee310290715c000fd771cd7e18b1537ccbc':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Merge commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23' into kraken
* commit '2d8d4d7b16b474ef58c86ae9ccd3dc70d7132c23':
Fix issue #2560791: Expose API to go in to car mode.
Merge commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9' into kraken
* commit 'c2eb4094d1f62cf6e4f10b0b1f64e64c70a03ea9':
Test connecitvity manager functionality in state change.
Merge commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5' into kraken
* commit 'b8fc825dfafd8792a4d9daead9d3d1b4a4b55de5':
Fix crash while turning bluetooth on, due to a race condition.
Merge commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982' into froyo-plus-aosp
* commit 'db3ea3d0064e0aeae350bca5e548e67f50f06982':
Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder
Merge commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256' into froyo-plus-aosp
* commit '513ae3610e5d6eac3af71c3e51a4e5e8b55b5256':
Fix issue #2560791: Expose API to go in to car mode.
Merge commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9' into froyo-plus-aosp
* commit 'de1b1872b33495da0bcd4c29ffeb3783fa7702e9':
Test connecitvity manager functionality in state change.
