Merge inbound to central, a=merge
authorWes Kocher <wkocher@mozilla.com>
Tue, 13 Jun 2017 18:27:10 -0700
changeset 412473 b266a8d8fd595b84a7d6218d7b8c6b7af0b5027c
parent 412406 6bea8e940b9c7cb5fdb769692cef7801616b983e (current diff)
parent 412472 bc0caf02d29423964f43f0bb83b2cb17ea33144d (diff)
child 412492 e18cf63f9984df98d075afc3bf775167eb82da6d
child 412581 1561522b11794e67dbdd5eafa1cd66bd5d635768
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone56.0a1
first release with
nightly linux32
b266a8d8fd59 / 56.0a1 / 20170614100332 / files
nightly linux64
b266a8d8fd59 / 56.0a1 / 20170614100332 / files
nightly mac
b266a8d8fd59 / 56.0a1 / 20170614030206 / files
nightly win32
b266a8d8fd59 / 56.0a1 / 20170614030206 / files
nightly win64
b266a8d8fd59 / 56.0a1 / 20170614030206 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to central, a=merge UPGRADE_NSS_RELEASE MozReview-Commit-ID: CBIFPwA5aNp
browser/locales/en-US/chrome/browser/searchbar.dtd
devtools/client/jsonview/utils.js
dom/media/systemservices/LoadManager.cpp
dom/media/systemservices/LoadManager.h
dom/media/systemservices/LoadManagerFactory.cpp
dom/media/systemservices/LoadManagerFactory.h
dom/media/systemservices/LoadMonitor.cpp
dom/media/systemservices/LoadMonitor.h
gfx/src/nsRenderingContext.h
gfx/webrender_bindings/WebRenderAPI.cpp
gfx/webrender_bindings/src/bindings.rs
gfx/webrender_bindings/webrender_ffi_generated.h
intl/uconv/8859-1.uf
intl/uconv/cp1252.uf
intl/uconv/cp1252.ut
intl/uconv/macroman.uf
intl/uconv/macroman.ut
intl/uconv/nsCP1252ToUnicode.cpp
intl/uconv/nsCP1252ToUnicode.h
intl/uconv/nsEncoderDecoderUtils.h
intl/uconv/nsISO88591ToUnicode.h
intl/uconv/nsIUnicodeDecoder.h
intl/uconv/nsIUnicodeEncoder.h
intl/uconv/nsMacRomanToUnicode.cpp
intl/uconv/nsMacRomanToUnicode.h
intl/uconv/nsNCRFallbackEncoderWrapper.cpp
intl/uconv/nsNCRFallbackEncoderWrapper.h
intl/uconv/nsReplacementToUnicode.cpp
intl/uconv/nsReplacementToUnicode.h
intl/uconv/nsUCSupport.h
intl/uconv/nsUTF8ToUnicode.cpp
intl/uconv/nsUTF8ToUnicode.h
intl/uconv/nsUTF8ToUnicodeSSE2.cpp
intl/uconv/nsUnicodeToCP1252.cpp
intl/uconv/nsUnicodeToCP1252.h
intl/uconv/nsUnicodeToISO88591.cpp
intl/uconv/nsUnicodeToISO88591.h
intl/uconv/nsUnicodeToMacRoman.cpp
intl/uconv/nsUnicodeToMacRoman.h
intl/uconv/nsUnicodeToUTF8.cpp
intl/uconv/nsUnicodeToUTF8.h
intl/uconv/tests/TestUConv.cpp
intl/uconv/tests/convperf.cpp
intl/uconv/tests/nsTestUConv.cpp
intl/uconv/tests/nsconv.cpp
intl/uconv/tests/unit/hangulTestStrings.js
intl/uconv/tests/unit/test_bug1008832.js
intl/uconv/tests/unit/test_decode_EUCKR_Hangul.js
intl/uconv/tests/unit/test_decode_x_mac_arabic.js
intl/uconv/tests/unit/test_decode_x_mac_arabic_internal.js
intl/uconv/tests/unit/test_decode_x_mac_ce.js
intl/uconv/tests/unit/test_decode_x_mac_croatian.js
intl/uconv/tests/unit/test_decode_x_mac_devanagari.js
intl/uconv/tests/unit/test_decode_x_mac_farsi.js
intl/uconv/tests/unit/test_decode_x_mac_farsi_internal.js
intl/uconv/tests/unit/test_decode_x_mac_greek.js
intl/uconv/tests/unit/test_decode_x_mac_gujarati.js
intl/uconv/tests/unit/test_decode_x_mac_gurmukhi.js
intl/uconv/tests/unit/test_decode_x_mac_hebrew.js
intl/uconv/tests/unit/test_decode_x_mac_hebrew_internal.js
intl/uconv/tests/unit/test_decode_x_mac_icelandic.js
intl/uconv/tests/unit/test_decode_x_mac_romanian.js
intl/uconv/tests/unit/test_decode_x_mac_turkish.js
intl/uconv/tests/unit/test_encode_x_mac_arabic.js
intl/uconv/tests/unit/test_encode_x_mac_ce.js
intl/uconv/tests/unit/test_encode_x_mac_croatian.js
intl/uconv/tests/unit/test_encode_x_mac_devanagari.js
intl/uconv/tests/unit/test_encode_x_mac_farsi.js
intl/uconv/tests/unit/test_encode_x_mac_greek.js
intl/uconv/tests/unit/test_encode_x_mac_gujarati.js
intl/uconv/tests/unit/test_encode_x_mac_gurmukhi.js
intl/uconv/tests/unit/test_encode_x_mac_hebrew.js
intl/uconv/tests/unit/test_encode_x_mac_icelandic.js
intl/uconv/tests/unit/test_encode_x_mac_romanian.js
intl/uconv/tests/unit/test_encode_x_mac_turkish.js
intl/uconv/tools/adobe.pl
intl/uconv/tools/cns.sh
intl/uconv/tools/cp936tocdx.pl
intl/uconv/tools/gen-big5-data.py
intl/uconv/tools/gengb18030tables.pl
intl/uconv/tools/genimpldefine.pl
intl/uconv/tools/indexes.json
intl/uconv/tools/jamap.pl
intl/uconv/tools/jis0212tojdx.pl
intl/uconv/tools/mkjpconv.pl
intl/uconv/tools/moz.build
intl/uconv/tools/nonhan.txt
intl/uconv/tools/parse-mozilla-encoding-table.pl
intl/uconv/tools/umaptable.c
intl/uconv/tools/unihan2cns.pl
intl/uconv/uconvutil.h
intl/uconv/ucvcn/cp936invmap.h
intl/uconv/ucvcn/cp936map.h
intl/uconv/ucvcn/gb180304bytes.uf
intl/uconv/ucvcn/gb180304bytes.ut
intl/uconv/ucvcn/gb18030uniq2b.uf
intl/uconv/ucvcn/gb18030uniq2b.ut
intl/uconv/ucvcn/gbku.h
intl/uconv/ucvcn/gbkuniq.uf
intl/uconv/ucvcn/nsGBKConvUtil.cpp
intl/uconv/ucvcn/nsGBKConvUtil.h
intl/uconv/ucvcn/nsGBKToUnicode.cpp
intl/uconv/ucvcn/nsGBKToUnicode.h
intl/uconv/ucvcn/nsUCvCnCID.h
intl/uconv/ucvcn/nsUnicodeToGBK.cpp
intl/uconv/ucvcn/nsUnicodeToGBK.h
intl/uconv/ucvcn/readme.txt
intl/uconv/ucvja/japanese.map
intl/uconv/ucvja/jis0201.uf
intl/uconv/ucvja/jis0201gl.uf
intl/uconv/ucvja/jis0208.uf
intl/uconv/ucvja/jis0208ext.uf
intl/uconv/ucvja/nsJapaneseToUnicode.cpp
intl/uconv/ucvja/nsJapaneseToUnicode.h
intl/uconv/ucvja/nsUCVJA2CID.h
intl/uconv/ucvja/nsUCVJACID.h
intl/uconv/ucvja/nsUCVJADll.h
intl/uconv/ucvja/nsUnicodeToEUCJP.cpp
intl/uconv/ucvja/nsUnicodeToEUCJP.h
intl/uconv/ucvja/nsUnicodeToISO2022JP.cpp
intl/uconv/ucvja/nsUnicodeToISO2022JP.h
intl/uconv/ucvja/nsUnicodeToSJIS.cpp
intl/uconv/ucvja/nsUnicodeToSJIS.h
intl/uconv/ucvja/sjis.uf
intl/uconv/ucvko/jamoclusters.h
intl/uconv/ucvko/nsCP949ToUnicode.cpp
intl/uconv/ucvko/nsCP949ToUnicode.h
intl/uconv/ucvko/nsUCvKOCID.h
intl/uconv/ucvko/nsUCvKODll.h
intl/uconv/ucvko/nsUnicodeToCP949.cpp
intl/uconv/ucvko/nsUnicodeToCP949.h
intl/uconv/ucvko/readme.txt
intl/uconv/ucvko/u20cp949hangul.uf
intl/uconv/ucvko/u20cp949hangul.ut
intl/uconv/ucvko/u20kscgl.uf
intl/uconv/ucvko/u20kscgl.ut
intl/uconv/ucvlatin/8859-10.uf
intl/uconv/ucvlatin/8859-10.ut
intl/uconv/ucvlatin/8859-13.uf
intl/uconv/ucvlatin/8859-13.ut
intl/uconv/ucvlatin/8859-14.uf
intl/uconv/ucvlatin/8859-14.ut
intl/uconv/ucvlatin/8859-15.uf
intl/uconv/ucvlatin/8859-15.ut
intl/uconv/ucvlatin/8859-16.uf
intl/uconv/ucvlatin/8859-16.ut
intl/uconv/ucvlatin/8859-2.uf
intl/uconv/ucvlatin/8859-2.ut
intl/uconv/ucvlatin/8859-3.uf
intl/uconv/ucvlatin/8859-3.ut
intl/uconv/ucvlatin/8859-4.uf
intl/uconv/ucvlatin/8859-4.ut
intl/uconv/ucvlatin/8859-5.uf
intl/uconv/ucvlatin/8859-5.ut
intl/uconv/ucvlatin/8859-6.uf
intl/uconv/ucvlatin/8859-6.ut
intl/uconv/ucvlatin/8859-7.uf
intl/uconv/ucvlatin/8859-7.ut
intl/uconv/ucvlatin/8859-8.uf
intl/uconv/ucvlatin/8859-8.ut
intl/uconv/ucvlatin/cp1250.uf
intl/uconv/ucvlatin/cp1250.ut
intl/uconv/ucvlatin/cp1251.uf
intl/uconv/ucvlatin/cp1251.ut
intl/uconv/ucvlatin/cp1253.uf
intl/uconv/ucvlatin/cp1253.ut
intl/uconv/ucvlatin/cp1254.uf
intl/uconv/ucvlatin/cp1254.ut
intl/uconv/ucvlatin/cp1255.uf
intl/uconv/ucvlatin/cp1255.ut
intl/uconv/ucvlatin/cp1256.uf
intl/uconv/ucvlatin/cp1256.ut
intl/uconv/ucvlatin/cp1257.uf
intl/uconv/ucvlatin/cp1257.ut
intl/uconv/ucvlatin/cp1258.uf
intl/uconv/ucvlatin/cp1258.ut
intl/uconv/ucvlatin/cp866.uf
intl/uconv/ucvlatin/cp866.ut
intl/uconv/ucvlatin/cp874.uf
intl/uconv/ucvlatin/cp874.ut
intl/uconv/ucvlatin/koi8r.uf
intl/uconv/ucvlatin/koi8r.ut
intl/uconv/ucvlatin/koi8u.uf
intl/uconv/ucvlatin/koi8u.ut
intl/uconv/ucvlatin/macarabic.ut
intl/uconv/ucvlatin/macce.ut
intl/uconv/ucvlatin/maccroat.ut
intl/uconv/ucvlatin/maccyril.uf
intl/uconv/ucvlatin/maccyril.ut
intl/uconv/ucvlatin/macdevanaga.ut
intl/uconv/ucvlatin/macfarsi.ut
intl/uconv/ucvlatin/macgreek.ut
intl/uconv/ucvlatin/macgujarati.ut
intl/uconv/ucvlatin/macgurmukhi.ut
intl/uconv/ucvlatin/machebrew.ut
intl/uconv/ucvlatin/macicela.ut
intl/uconv/ucvlatin/macro.ut
intl/uconv/ucvlatin/macturki.ut
intl/uconv/ucvlatin/nsCP1250ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1250ToUnicode.h
intl/uconv/ucvlatin/nsCP1251ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1251ToUnicode.h
intl/uconv/ucvlatin/nsCP1253ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1253ToUnicode.h
intl/uconv/ucvlatin/nsCP1254ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1254ToUnicode.h
intl/uconv/ucvlatin/nsCP1255ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1255ToUnicode.h
intl/uconv/ucvlatin/nsCP1256ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1256ToUnicode.h
intl/uconv/ucvlatin/nsCP1257ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1257ToUnicode.h
intl/uconv/ucvlatin/nsCP1258ToUnicode.cpp
intl/uconv/ucvlatin/nsCP1258ToUnicode.h
intl/uconv/ucvlatin/nsCP866ToUnicode.cpp
intl/uconv/ucvlatin/nsCP866ToUnicode.h
intl/uconv/ucvlatin/nsCP874ToUnicode.cpp
intl/uconv/ucvlatin/nsCP874ToUnicode.h
intl/uconv/ucvlatin/nsISO885910ToUnicode.cpp
intl/uconv/ucvlatin/nsISO885910ToUnicode.h
intl/uconv/ucvlatin/nsISO885913ToUnicode.cpp
intl/uconv/ucvlatin/nsISO885913ToUnicode.h
intl/uconv/ucvlatin/nsISO885914ToUnicode.cpp
intl/uconv/ucvlatin/nsISO885914ToUnicode.h
intl/uconv/ucvlatin/nsISO885915ToUnicode.cpp
intl/uconv/ucvlatin/nsISO885915ToUnicode.h
intl/uconv/ucvlatin/nsISO885916ToUnicode.cpp
intl/uconv/ucvlatin/nsISO885916ToUnicode.h
intl/uconv/ucvlatin/nsISO88592ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88592ToUnicode.h
intl/uconv/ucvlatin/nsISO88593ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88593ToUnicode.h
intl/uconv/ucvlatin/nsISO88594ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88594ToUnicode.h
intl/uconv/ucvlatin/nsISO88595ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88595ToUnicode.h
intl/uconv/ucvlatin/nsISO88596ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88596ToUnicode.h
intl/uconv/ucvlatin/nsISO88597ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88597ToUnicode.h
intl/uconv/ucvlatin/nsISO88598IToUnicode.cpp
intl/uconv/ucvlatin/nsISO88598IToUnicode.h
intl/uconv/ucvlatin/nsISO88598ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88598ToUnicode.h
intl/uconv/ucvlatin/nsKOI8RToUnicode.cpp
intl/uconv/ucvlatin/nsKOI8RToUnicode.h
intl/uconv/ucvlatin/nsKOI8UToUnicode.cpp
intl/uconv/ucvlatin/nsKOI8UToUnicode.h
intl/uconv/ucvlatin/nsMacArabicToUnicode.cpp
intl/uconv/ucvlatin/nsMacArabicToUnicode.h
intl/uconv/ucvlatin/nsMacCEToUnicode.cpp
intl/uconv/ucvlatin/nsMacCEToUnicode.h
intl/uconv/ucvlatin/nsMacCroatianToUnicode.cpp
intl/uconv/ucvlatin/nsMacCroatianToUnicode.h
intl/uconv/ucvlatin/nsMacCyrillicToUnicode.cpp
intl/uconv/ucvlatin/nsMacCyrillicToUnicode.h
intl/uconv/ucvlatin/nsMacDevanagariToUnicode.cpp
intl/uconv/ucvlatin/nsMacDevanagariToUnicode.h
intl/uconv/ucvlatin/nsMacFarsiToUnicode.cpp
intl/uconv/ucvlatin/nsMacFarsiToUnicode.h
intl/uconv/ucvlatin/nsMacGreekToUnicode.cpp
intl/uconv/ucvlatin/nsMacGreekToUnicode.h
intl/uconv/ucvlatin/nsMacGujaratiToUnicode.cpp
intl/uconv/ucvlatin/nsMacGujaratiToUnicode.h
intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.cpp
intl/uconv/ucvlatin/nsMacGurmukhiToUnicode.h
intl/uconv/ucvlatin/nsMacHebrewToUnicode.cpp
intl/uconv/ucvlatin/nsMacHebrewToUnicode.h
intl/uconv/ucvlatin/nsMacIcelandicToUnicode.cpp
intl/uconv/ucvlatin/nsMacIcelandicToUnicode.h
intl/uconv/ucvlatin/nsMacRomanianToUnicode.cpp
intl/uconv/ucvlatin/nsMacRomanianToUnicode.h
intl/uconv/ucvlatin/nsMacTurkishToUnicode.cpp
intl/uconv/ucvlatin/nsMacTurkishToUnicode.h
intl/uconv/ucvlatin/nsUCvLatinCID.h
intl/uconv/ucvlatin/nsUTF16ToUnicode.cpp
intl/uconv/ucvlatin/nsUTF16ToUnicode.h
intl/uconv/ucvlatin/nsUnicodeToCP1250.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1250.h
intl/uconv/ucvlatin/nsUnicodeToCP1251.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1251.h
intl/uconv/ucvlatin/nsUnicodeToCP1253.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1253.h
intl/uconv/ucvlatin/nsUnicodeToCP1254.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1254.h
intl/uconv/ucvlatin/nsUnicodeToCP1255.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1255.h
intl/uconv/ucvlatin/nsUnicodeToCP1256.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1256.h
intl/uconv/ucvlatin/nsUnicodeToCP1257.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1257.h
intl/uconv/ucvlatin/nsUnicodeToCP1258.cpp
intl/uconv/ucvlatin/nsUnicodeToCP1258.h
intl/uconv/ucvlatin/nsUnicodeToCP866.cpp
intl/uconv/ucvlatin/nsUnicodeToCP866.h
intl/uconv/ucvlatin/nsUnicodeToCP874.cpp
intl/uconv/ucvlatin/nsUnicodeToCP874.h
intl/uconv/ucvlatin/nsUnicodeToISO885910.cpp
intl/uconv/ucvlatin/nsUnicodeToISO885910.h
intl/uconv/ucvlatin/nsUnicodeToISO885913.cpp
intl/uconv/ucvlatin/nsUnicodeToISO885913.h
intl/uconv/ucvlatin/nsUnicodeToISO885914.cpp
intl/uconv/ucvlatin/nsUnicodeToISO885914.h
intl/uconv/ucvlatin/nsUnicodeToISO885915.cpp
intl/uconv/ucvlatin/nsUnicodeToISO885915.h
intl/uconv/ucvlatin/nsUnicodeToISO885916.cpp
intl/uconv/ucvlatin/nsUnicodeToISO885916.h
intl/uconv/ucvlatin/nsUnicodeToISO88592.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88592.h
intl/uconv/ucvlatin/nsUnicodeToISO88593.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88593.h
intl/uconv/ucvlatin/nsUnicodeToISO88594.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88594.h
intl/uconv/ucvlatin/nsUnicodeToISO88595.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88595.h
intl/uconv/ucvlatin/nsUnicodeToISO88596.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88596.h
intl/uconv/ucvlatin/nsUnicodeToISO88597.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88597.h
intl/uconv/ucvlatin/nsUnicodeToISO88598.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88598.h
intl/uconv/ucvlatin/nsUnicodeToISO88598I.cpp
intl/uconv/ucvlatin/nsUnicodeToISO88598I.h
intl/uconv/ucvlatin/nsUnicodeToKOI8R.cpp
intl/uconv/ucvlatin/nsUnicodeToKOI8R.h
intl/uconv/ucvlatin/nsUnicodeToKOI8U.cpp
intl/uconv/ucvlatin/nsUnicodeToKOI8U.h
intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.cpp
intl/uconv/ucvlatin/nsUnicodeToMacCyrillic.h
intl/uconv/ucvlatin/nsUnicodeToUTF16.cpp
intl/uconv/ucvlatin/nsUnicodeToUTF16.h
intl/uconv/ucvlatin/nsUnicodeToUserDefined.cpp
intl/uconv/ucvlatin/nsUnicodeToUserDefined.h
intl/uconv/ucvlatin/nsUserDefinedToUnicode.cpp
intl/uconv/ucvlatin/nsUserDefinedToUnicode.h
intl/uconv/ucvlatin/userdefined.uf
intl/uconv/ucvlatin/userdefined.ut
intl/uconv/ucvth/readme.txt
intl/uconv/ucvtw/nsBIG5Data.cpp
intl/uconv/ucvtw/nsBIG5Data.h
intl/uconv/ucvtw/nsBIG5ToUnicode.cpp
intl/uconv/ucvtw/nsBIG5ToUnicode.h
intl/uconv/ucvtw/nsUnicodeToBIG5.cpp
intl/uconv/ucvtw/nsUnicodeToBIG5.h
intl/uconv/util/nsUCConstructors.cpp
intl/uconv/util/nsUCConstructors.h
intl/uconv/util/nsUCSupport.cpp
intl/uconv/util/nsUnicodeDecodeHelper.cpp
intl/uconv/util/nsUnicodeDecodeHelper.h
intl/uconv/util/nsUnicodeEncodeHelper.cpp
intl/uconv/util/nsUnicodeEncodeHelper.h
intl/uconv/util/ugen.c
intl/uconv/util/umap.c
intl/uconv/util/umap.h
intl/uconv/util/unicpriv.h
intl/uconv/util/uscan.c
media/webrtc/trunk/webrtc/api/BUILD.gn
media/webrtc/trunk/webrtc/api/OWNERS
media/webrtc/trunk/webrtc/api/api.gyp
media/webrtc/trunk/webrtc/api/api_tests.gyp
media/webrtc/trunk/webrtc/api/objc/OWNERS
media/webrtc/trunk/webrtc/api/objc/README
media/webrtc/trunk/webrtc/api/objc/RTCEAGLVideoView.h
media/webrtc/trunk/webrtc/api/objc/RTCEAGLVideoView.m
media/webrtc/trunk/webrtc/api/objc/RTCIceCandidate+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCIceCandidate.h
media/webrtc/trunk/webrtc/api/objc/RTCIceCandidate.mm
media/webrtc/trunk/webrtc/api/objc/RTCIceServer+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCIceServer.h
media/webrtc/trunk/webrtc/api/objc/RTCIceServer.mm
media/webrtc/trunk/webrtc/api/objc/RTCMediaConstraints+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaConstraints.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaConstraints.mm
media/webrtc/trunk/webrtc/api/objc/RTCMediaSource+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaSource.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaSource.mm
media/webrtc/trunk/webrtc/api/objc/RTCMediaStreamTrack+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaStreamTrack.h
media/webrtc/trunk/webrtc/api/objc/RTCMediaStreamTrack.mm
media/webrtc/trunk/webrtc/api/objc/RTCNSGLVideoView.h
media/webrtc/trunk/webrtc/api/objc/RTCNSGLVideoView.m
media/webrtc/trunk/webrtc/api/objc/RTCOpenGLVideoRenderer.h
media/webrtc/trunk/webrtc/api/objc/RTCOpenGLVideoRenderer.mm
media/webrtc/trunk/webrtc/api/objc/RTCSessionDescription+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCSessionDescription.h
media/webrtc/trunk/webrtc/api/objc/RTCSessionDescription.mm
media/webrtc/trunk/webrtc/api/objc/RTCStatsReport+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCStatsReport.h
media/webrtc/trunk/webrtc/api/objc/RTCStatsReport.mm
media/webrtc/trunk/webrtc/api/objc/RTCVideoFrame+Private.h
media/webrtc/trunk/webrtc/api/objc/RTCVideoFrame.h
media/webrtc/trunk/webrtc/api/objc/RTCVideoFrame.mm
media/webrtc/trunk/webrtc/api/objc/RTCVideoRenderer.h
media/webrtc/trunk/webrtc/api/objc/WebRTC-Prefix.pch
media/webrtc/trunk/webrtc/api/objctests/RTCIceCandidateTest.mm
media/webrtc/trunk/webrtc/api/objctests/RTCIceServerTest.mm
media/webrtc/trunk/webrtc/api/objctests/RTCMediaConstraintsTest.mm
media/webrtc/trunk/webrtc/api/objctests/RTCSessionDescriptionTest.mm
media/webrtc/trunk/webrtc/audio/audio_sink.h
media/webrtc/trunk/webrtc/audio/webrtc_audio.gypi
media/webrtc/trunk/webrtc/audio_receive_stream.h
media/webrtc/trunk/webrtc/audio_send_stream.h
media/webrtc/trunk/webrtc/audio_state.h
media/webrtc/trunk/webrtc/base/asyncfile.cc
media/webrtc/trunk/webrtc/base/asyncfile.h
media/webrtc/trunk/webrtc/base/asynchttprequest.cc
media/webrtc/trunk/webrtc/base/asynchttprequest.h
media/webrtc/trunk/webrtc/base/bandwidthsmoother.cc
media/webrtc/trunk/webrtc/base/bandwidthsmoother.h
media/webrtc/trunk/webrtc/base/bandwidthsmoother_unittest.cc
media/webrtc/trunk/webrtc/base/base.gyp
media/webrtc/trunk/webrtc/base/base_tests.gyp
media/webrtc/trunk/webrtc/base/buffer.cc
media/webrtc/trunk/webrtc/base/dbus.cc
media/webrtc/trunk/webrtc/base/dbus.h
media/webrtc/trunk/webrtc/base/dbus_unittest.cc
media/webrtc/trunk/webrtc/base/exp_filter.cc
media/webrtc/trunk/webrtc/base/exp_filter.h
media/webrtc/trunk/webrtc/base/exp_filter_unittest.cc
media/webrtc/trunk/webrtc/base/faketaskrunner.h
media/webrtc/trunk/webrtc/base/httprequest.cc
media/webrtc/trunk/webrtc/base/httprequest.h
media/webrtc/trunk/webrtc/base/iosfilesystem.mm
media/webrtc/trunk/webrtc/base/latebindingsymboltable.cc
media/webrtc/trunk/webrtc/base/latebindingsymboltable.cc.def
media/webrtc/trunk/webrtc/base/latebindingsymboltable.h
media/webrtc/trunk/webrtc/base/latebindingsymboltable.h.def
media/webrtc/trunk/webrtc/base/latebindingsymboltable_unittest.cc
media/webrtc/trunk/webrtc/base/libdbusglibsymboltable.cc
media/webrtc/trunk/webrtc/base/libdbusglibsymboltable.h
media/webrtc/trunk/webrtc/base/linux.cc
media/webrtc/trunk/webrtc/base/linux.h
media/webrtc/trunk/webrtc/base/linux_unittest.cc
media/webrtc/trunk/webrtc/base/linuxfdwalk.c
media/webrtc/trunk/webrtc/base/linuxfdwalk.h
media/webrtc/trunk/webrtc/base/linuxfdwalk_unittest.cc
media/webrtc/trunk/webrtc/base/macasyncsocket.cc
media/webrtc/trunk/webrtc/base/macasyncsocket.h
media/webrtc/trunk/webrtc/base/maccocoasocketserver.h
media/webrtc/trunk/webrtc/base/maccocoasocketserver.mm
media/webrtc/trunk/webrtc/base/maccocoasocketserver_unittest.mm
media/webrtc/trunk/webrtc/base/macsocketserver.cc
media/webrtc/trunk/webrtc/base/macsocketserver.h
media/webrtc/trunk/webrtc/base/macsocketserver_unittest.cc
media/webrtc/trunk/webrtc/base/macwindowpicker.cc
media/webrtc/trunk/webrtc/base/macwindowpicker.h
media/webrtc/trunk/webrtc/base/macwindowpicker_unittest.cc
media/webrtc/trunk/webrtc/base/multipart.cc
media/webrtc/trunk/webrtc/base/multipart.h
media/webrtc/trunk/webrtc/base/multipart_unittest.cc
media/webrtc/trunk/webrtc/base/objc/NSString+StdString.h
media/webrtc/trunk/webrtc/base/objc/NSString+StdString.mm
media/webrtc/trunk/webrtc/base/objc/OWNERS
media/webrtc/trunk/webrtc/base/objc/RTCCameraPreviewView.h
media/webrtc/trunk/webrtc/base/objc/RTCCameraPreviewView.m
media/webrtc/trunk/webrtc/base/objc/RTCDispatcher.h
media/webrtc/trunk/webrtc/base/objc/RTCDispatcher.m
media/webrtc/trunk/webrtc/base/objc/RTCLogging.h
media/webrtc/trunk/webrtc/base/objc/RTCLogging.mm
media/webrtc/trunk/webrtc/base/posix.cc
media/webrtc/trunk/webrtc/base/posix.h
media/webrtc/trunk/webrtc/base/profiler.cc
media/webrtc/trunk/webrtc/base/profiler.h
media/webrtc/trunk/webrtc/base/profiler_unittest.cc
media/webrtc/trunk/webrtc/base/referencecountedsingletonfactory.h
media/webrtc/trunk/webrtc/base/referencecountedsingletonfactory_unittest.cc
media/webrtc/trunk/webrtc/base/rtccertificate_unittests.cc
media/webrtc/trunk/webrtc/base/scoped_ptr.h
media/webrtc/trunk/webrtc/base/sec_buffer.h
media/webrtc/trunk/webrtc/base/sslstreamadapterhelper.cc
media/webrtc/trunk/webrtc/base/sslstreamadapterhelper.h
media/webrtc/trunk/webrtc/base/systeminfo.cc
media/webrtc/trunk/webrtc/base/systeminfo.h
media/webrtc/trunk/webrtc/base/systeminfo_unittest.cc
media/webrtc/trunk/webrtc/base/timing.cc
media/webrtc/trunk/webrtc/base/timing.h
media/webrtc/trunk/webrtc/base/urlencode.cc
media/webrtc/trunk/webrtc/base/urlencode.h
media/webrtc/trunk/webrtc/base/urlencode_unittest.cc
media/webrtc/trunk/webrtc/base/versionparsing.cc
media/webrtc/trunk/webrtc/base/versionparsing.h
media/webrtc/trunk/webrtc/base/versionparsing_unittest.cc
media/webrtc/trunk/webrtc/base/win32regkey.cc
media/webrtc/trunk/webrtc/base/win32regkey.h
media/webrtc/trunk/webrtc/base/win32regkey_unittest.cc
media/webrtc/trunk/webrtc/base/win32windowpicker.cc
media/webrtc/trunk/webrtc/base/win32windowpicker.h
media/webrtc/trunk/webrtc/base/win32windowpicker_unittest.cc
media/webrtc/trunk/webrtc/base/windowpicker.h
media/webrtc/trunk/webrtc/base/windowpicker_unittest.cc
media/webrtc/trunk/webrtc/base/windowpickerfactory.h
media/webrtc/trunk/webrtc/base/winfirewall.cc
media/webrtc/trunk/webrtc/base/winfirewall.h
media/webrtc/trunk/webrtc/base/winfirewall_unittest.cc
media/webrtc/trunk/webrtc/base/worker.cc
media/webrtc/trunk/webrtc/base/worker.h
media/webrtc/trunk/webrtc/base/x11windowpicker.cc
media/webrtc/trunk/webrtc/base/x11windowpicker.h
media/webrtc/trunk/webrtc/base/x11windowpicker_unittest.cc
media/webrtc/trunk/webrtc/build/android/test_runner.py
media/webrtc/trunk/webrtc/build/apk_test.gypi
media/webrtc/trunk/webrtc/build/apk_tests.gyp
media/webrtc/trunk/webrtc/build/apk_tests_noop.gyp
media/webrtc/trunk/webrtc/build/arm_neon.gypi
media/webrtc/trunk/webrtc/build/common.gypi
media/webrtc/trunk/webrtc/build/download_vs_toolchain.py
media/webrtc/trunk/webrtc/build/extra_gitignore.py
media/webrtc/trunk/webrtc/build/find_directx_sdk.py
media/webrtc/trunk/webrtc/build/generate_srcjar.py
media/webrtc/trunk/webrtc/build/google_play_services_download.py
media/webrtc/trunk/webrtc/build/gyp_webrtc
media/webrtc/trunk/webrtc/build/gyp_webrtc.py
media/webrtc/trunk/webrtc/build/isolate.gypi
media/webrtc/trunk/webrtc/build/merge_libs.gyp
media/webrtc/trunk/webrtc/build/merge_voice_libs.gyp
media/webrtc/trunk/webrtc/build/protoc.gypi
media/webrtc/trunk/webrtc/call/congestion_controller.cc
media/webrtc/trunk/webrtc/call/congestion_controller.h
media/webrtc/trunk/webrtc/call/mock/mock_congestion_controller.h
media/webrtc/trunk/webrtc/call/rtc_event_log.cc
media/webrtc/trunk/webrtc/call/rtc_event_log.h
media/webrtc/trunk/webrtc/call/rtc_event_log.proto
media/webrtc/trunk/webrtc/call/rtc_event_log2rtp_dump.cc
media/webrtc/trunk/webrtc/call/rtc_event_log_unittest.cc
media/webrtc/trunk/webrtc/call/transport_adapter.cc
media/webrtc/trunk/webrtc/call/transport_adapter.h
media/webrtc/trunk/webrtc/call/webrtc_call.gypi
media/webrtc/trunk/webrtc/common.gyp
media/webrtc/trunk/webrtc/common.h
media/webrtc/trunk/webrtc/common_audio/common_audio.gyp
media/webrtc/trunk/webrtc/common_audio/common_audio_unittests.isolate
media/webrtc/trunk/webrtc/common_audio/swap_queue.h
media/webrtc/trunk/webrtc/common_audio/swap_queue_unittest.cc
media/webrtc/trunk/webrtc/common_video/common_video.gyp
media/webrtc/trunk/webrtc/common_video/common_video_unittests.gyp
media/webrtc/trunk/webrtc/common_video/common_video_unittests.isolate
media/webrtc/trunk/webrtc/common_video/libyuv/include/scaler.h
media/webrtc/trunk/webrtc/common_video/libyuv/scaler.cc
media/webrtc/trunk/webrtc/common_video/libyuv/scaler_unittest.cc
media/webrtc/trunk/webrtc/engine_configurations.h
media/webrtc/trunk/webrtc/frame_callback.h
media/webrtc/trunk/webrtc/modules/audio_codec_speed_tests.isolate
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_neteq_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.h
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/initial_delay_manager.cc
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/initial_delay_manager.h
media/webrtc/trunk/webrtc/modules/audio_coding/acm2/initial_delay_manager_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/audio_coding_tests.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/cng/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/cng/cng.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/cng/webrtc_cng.c
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/g711/g711.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/g722/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/g722/g722.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/ilbc/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/ilbc/ilbc.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/interfaces.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/isac.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/isac_test.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/isacfix_test.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/source/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/main/test/debugUtility.h
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/pcm16b/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/codecs/tools/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/OWNERS
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier.h
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/audio_classifier_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/mock/mock_audio_vector.h
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/mock/mock_payload_splitter.h
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/nack.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/nack.h
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/nack_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/neteq_tests.gypi
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/payload_splitter.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/payload_splitter.h
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/payload_splitter_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/test/audio_classifier_test.cc
media/webrtc/trunk/webrtc/modules/audio_coding/neteq/test/rtp_to_text.cc
media/webrtc/trunk/webrtc/modules/audio_coding/test/SpatialAudio.cc
media/webrtc/trunk/webrtc/modules/audio_coding/test/SpatialAudio.h
media/webrtc/trunk/webrtc/modules/audio_coding/test/TimedTrace.cc
media/webrtc/trunk/webrtc/modules/audio_coding/test/TimedTrace.h
media/webrtc/trunk/webrtc/modules/audio_conference_mixer/audio_conference_mixer.gypi
media/webrtc/trunk/webrtc/modules/audio_conference_mixer/source/OWNERS
media/webrtc/trunk/webrtc/modules/audio_decoder_unittests.isolate
media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
media/webrtc/trunk/webrtc/modules/audio_device/opensl/single_rw_fifo.cc
media/webrtc/trunk/webrtc/modules/audio_device/opensl/single_rw_fifo.h
media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.cc
media/webrtc/trunk/webrtc/modules/audio_device/sndio/audio_device_sndio.h
media/webrtc/trunk/webrtc/modules/audio_device/test/README.txt
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/.classpath
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/AndroidManifest.xml
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/default.properties
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/gen/org/webrtc/voiceengine/test/R.java
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/res/drawable/icon.png
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/res/layout/main.xml
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/res/values/strings.xml
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/AudioDeviceAndroid.java
media/webrtc/trunk/webrtc/modules/audio_device/test/android/audio_device_android_test/src/org/webrtc/voiceengine/test/AudioDeviceAndroidTest.java
media/webrtc/trunk/webrtc/modules/audio_device/test/audio_device_test_func.cc
media/webrtc/trunk/webrtc/modules/audio_device/test/func_test_manager.cc
media/webrtc/trunk/webrtc/modules/audio_device/test/func_test_manager.h
media/webrtc/trunk/webrtc/modules/audio_device_tests.isolate
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core_internal.h
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core_mips.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core_neon.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_core_sse2.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_rdft.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_rdft.h
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_rdft_mips.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_rdft_neon.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_rdft_sse2.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/aec_resampler.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/echo_cancellation.c
media/webrtc/trunk/webrtc/modules/audio_processing/aec/echo_cancellation_internal.h
media/webrtc/trunk/webrtc/modules/audio_processing/aecm/aecm_core.c
media/webrtc/trunk/webrtc/modules/audio_processing/aecm/aecm_core_c.c
media/webrtc/trunk/webrtc/modules/audio_processing/aecm/aecm_core_mips.c
media/webrtc/trunk/webrtc/modules/audio_processing/aecm/aecm_core_neon.c
media/webrtc/trunk/webrtc/modules/audio_processing/aecm/echo_control_mobile.c
media/webrtc/trunk/webrtc/modules/audio_processing/agc/agc_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_processing/agc/histogram.cc
media/webrtc/trunk/webrtc/modules/audio_processing/agc/histogram.h
media/webrtc/trunk/webrtc/modules/audio_processing/agc/histogram_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_tests.gypi
media/webrtc/trunk/webrtc/modules/audio_processing/beamformer/beamformer.h
media/webrtc/trunk/webrtc/modules/audio_processing/high_pass_filter_impl.cc
media/webrtc/trunk/webrtc/modules/audio_processing/high_pass_filter_impl.h
media/webrtc/trunk/webrtc/modules/audio_processing/logging/aec_logging.h
media/webrtc/trunk/webrtc/modules/audio_processing/logging/aec_logging_file_handling.cc
media/webrtc/trunk/webrtc/modules/audio_processing/logging/aec_logging_file_handling.h
media/webrtc/trunk/webrtc/modules/audio_processing/processing_component.cc
media/webrtc/trunk/webrtc/modules/audio_processing/processing_component.h
media/webrtc/trunk/webrtc/modules/audio_processing/test/audio_file_processor.cc
media/webrtc/trunk/webrtc/modules/audio_processing/test/audio_file_processor.h
media/webrtc/trunk/webrtc/modules/audio_processing/test/audio_processing_unittest.cc
media/webrtc/trunk/webrtc/modules/audio_processing/test/process_test.cc
media/webrtc/trunk/webrtc/modules/audio_processing/utility/delay_estimator.c
media/webrtc/trunk/webrtc/modules/audio_processing/utility/delay_estimator_wrapper.c
media/webrtc/trunk/webrtc/modules/bitrate_controller/bitrate_controller.gypi
media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_mac.mm
media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_unittest.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_win.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/app_capturer_x11.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture.gypi
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_device_info.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/differ.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/differ.h
media/webrtc/trunk/webrtc/modules/desktop_capture/differ_block_sse2.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/differ_block_sse2.h
media/webrtc/trunk/webrtc/modules/desktop_capture/differ_unittest.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/mouse_cursor_shape.h
media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capture_frame_queue.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h
media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer_mock_objects.h
media/webrtc/trunk/webrtc/modules/desktop_capture/win/desktop_device_info_win.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer.h
media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_x11.cc
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
media/webrtc/trunk/webrtc/modules/media_file/media_file.gypi
media/webrtc/trunk/webrtc/modules/modules.gyp
media/webrtc/trunk/webrtc/modules/modules_java.gyp
media/webrtc/trunk/webrtc/modules/modules_java_chromium.gyp
media/webrtc/trunk/webrtc/modules/modules_tests.isolate
media/webrtc/trunk/webrtc/modules/modules_unittests.isolate
media/webrtc/trunk/webrtc/modules/pacing/pacing.gypi
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/rate_statistics.cc
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/rate_statistics.h
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/rate_statistics_unittest.cc
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/test/plot_dynamics.py
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/test/plot_dynamics.sh
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.cc
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h
media/webrtc/trunk/webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/include/fec_receiver.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/rtp_rtcp.gypi
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/OWNERS
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/bitrate.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/bitrate.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/fec_receiver_impl.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/fec_receiver_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_bitstream_parser.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_bitstream_parser_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_sps_parser.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_sps_parser.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/producer_fec.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/producer_fec.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.cc
media/webrtc/trunk/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
media/webrtc/trunk/webrtc/modules/rtp_rtcp/test/OWNERS
media/webrtc/trunk/webrtc/modules/rtp_rtcp/test/testFec/OWNERS
media/webrtc/trunk/webrtc/modules/rtp_rtcp/test/testFec/test_fec.gypi
media/webrtc/trunk/webrtc/modules/utility/include/file_player.h
media/webrtc/trunk/webrtc/modules/utility/include/file_recorder.h
media/webrtc/trunk/webrtc/modules/utility/include/helpers_ios.h
media/webrtc/trunk/webrtc/modules/utility/source/OWNERS
media/webrtc/trunk/webrtc/modules/utility/source/audio_frame_operations.cc
media/webrtc/trunk/webrtc/modules/utility/source/audio_frame_operations_unittest.cc
media/webrtc/trunk/webrtc/modules/utility/source/coder.cc
media/webrtc/trunk/webrtc/modules/utility/source/coder.h
media/webrtc/trunk/webrtc/modules/utility/source/file_player_impl.cc
media/webrtc/trunk/webrtc/modules/utility/source/file_player_impl.h
media/webrtc/trunk/webrtc/modules/utility/source/file_player_unittests.cc
media/webrtc/trunk/webrtc/modules/utility/source/file_recorder_impl.cc
media/webrtc/trunk/webrtc/modules/utility/source/file_recorder_impl.h
media/webrtc/trunk/webrtc/modules/utility/source/helpers_ios.mm
media/webrtc/trunk/webrtc/modules/utility/utility.gypi
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.cc
media/webrtc/trunk/webrtc/modules/video_capture/android/device_info_android.h
media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.cc
media/webrtc/trunk/webrtc/modules/video_capture/android/video_capture_android.h
media/webrtc/trunk/webrtc/modules/video_capture/ios/device_info_ios.h
media/webrtc/trunk/webrtc/modules/video_capture/ios/device_info_ios.mm
media/webrtc/trunk/webrtc/modules/video_capture/ios/device_info_ios_objc.h
media/webrtc/trunk/webrtc/modules/video_capture/ios/device_info_ios_objc.mm
media/webrtc/trunk/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.h
media/webrtc/trunk/webrtc/modules/video_capture/ios/rtc_video_capture_ios_objc.mm
media/webrtc/trunk/webrtc/modules/video_capture/ios/video_capture_ios.h
media/webrtc/trunk/webrtc/modules/video_capture/ios/video_capture_ios.mm
media/webrtc/trunk/webrtc/modules/video_capture/mac/avfoundation/video_capture_avfoundation_objc.mm
media/webrtc/trunk/webrtc/modules/video_capture/mac/video_capture_mac.mm
media/webrtc/trunk/webrtc/modules/video_capture/video_capture.gypi
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_internal.h
media/webrtc/trunk/webrtc/modules/video_capture/video_capture_tests.isolate
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264.gypi
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_objc.mm
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h
media/webrtc/trunk/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/i420/OWNERS
media/webrtc/trunk/webrtc/modules/video_coding/codecs/i420/i420.gypi
media/webrtc/trunk/webrtc/modules/video_coding/codecs/test/OWNERS
media/webrtc/trunk/webrtc/modules/video_coding/codecs/test/video_codecs_test_framework.gypi
media/webrtc/trunk/webrtc/modules/video_coding/codecs/tools/OWNERS
media/webrtc/trunk/webrtc/modules/video_coding/codecs/tools/video_codecs_tools.gypi
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/OWNERS
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8.gyp
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_factory.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_factory.h
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/screenshare_layers_unittest.cc
media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp9/vp9.gyp
media/webrtc/trunk/webrtc/modules/video_coding/content_metrics_processing.cc
media/webrtc/trunk/webrtc/modules/video_coding/content_metrics_processing.h
media/webrtc/trunk/webrtc/modules/video_coding/fec_tables_xor.h
media/webrtc/trunk/webrtc/modules/video_coding/media_optimization_unittest.cc
media/webrtc/trunk/webrtc/modules/video_coding/qm_select.cc
media/webrtc/trunk/webrtc/modules/video_coding/qm_select.h
media/webrtc/trunk/webrtc/modules/video_coding/qm_select_data.h
media/webrtc/trunk/webrtc/modules/video_coding/qm_select_unittest.cc
media/webrtc/trunk/webrtc/modules/video_coding/test/release_test.h
media/webrtc/trunk/webrtc/modules/video_coding/test/video_source.h
media/webrtc/trunk/webrtc/modules/video_coding/utility/OWNERS
media/webrtc/trunk/webrtc/modules/video_coding/utility/video_coding_utility.gyp
media/webrtc/trunk/webrtc/modules/video_coding/video_coding.gypi
media/webrtc/trunk/webrtc/modules/video_coding/video_coding_test.gypi
media/webrtc/trunk/webrtc/modules/video_processing/brightness_detection.cc
media/webrtc/trunk/webrtc/modules/video_processing/brightness_detection.h
media/webrtc/trunk/webrtc/modules/video_processing/content_analysis.cc
media/webrtc/trunk/webrtc/modules/video_processing/content_analysis.h
media/webrtc/trunk/webrtc/modules/video_processing/content_analysis_sse2.cc
media/webrtc/trunk/webrtc/modules/video_processing/deflickering.cc
media/webrtc/trunk/webrtc/modules/video_processing/deflickering.h
media/webrtc/trunk/webrtc/modules/video_processing/frame_preprocessor.cc
media/webrtc/trunk/webrtc/modules/video_processing/frame_preprocessor.h
media/webrtc/trunk/webrtc/modules/video_processing/include/video_processing.h
media/webrtc/trunk/webrtc/modules/video_processing/include/video_processing_defines.h
media/webrtc/trunk/webrtc/modules/video_processing/spatial_resampler.cc
media/webrtc/trunk/webrtc/modules/video_processing/spatial_resampler.h
media/webrtc/trunk/webrtc/modules/video_processing/test/brightness_detection_test.cc
media/webrtc/trunk/webrtc/modules/video_processing/test/content_metrics_test.cc
media/webrtc/trunk/webrtc/modules/video_processing/test/createTable.m
media/webrtc/trunk/webrtc/modules/video_processing/test/deflickering_test.cc
media/webrtc/trunk/webrtc/modules/video_processing/test/readYUV420file.m
media/webrtc/trunk/webrtc/modules/video_processing/test/video_processing_unittest.cc
media/webrtc/trunk/webrtc/modules/video_processing/test/video_processing_unittest.h
media/webrtc/trunk/webrtc/modules/video_processing/test/writeYUV420file.m
media/webrtc/trunk/webrtc/modules/video_processing/video_decimator.cc
media/webrtc/trunk/webrtc/modules/video_processing/video_decimator.h
media/webrtc/trunk/webrtc/modules/video_processing/video_processing.gypi
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_impl.cc
media/webrtc/trunk/webrtc/modules/video_processing/video_processing_impl.h
media/webrtc/trunk/webrtc/modules/video_render/BUILD.gn
media/webrtc/trunk/webrtc/modules/video_render/OWNERS
media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java
media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java
media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_impl.h
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_native_opengl2.h
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_surface_view.cc
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_android_surface_view.h
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_opengles20.cc
media/webrtc/trunk/webrtc/modules/video_render/android/video_render_opengles20.h
media/webrtc/trunk/webrtc/modules/video_render/external/video_render_external_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/external/video_render_external_impl.h
media/webrtc/trunk/webrtc/modules/video_render/i_video_render.h
media/webrtc/trunk/webrtc/modules/video_render/ios/open_gles20.h
media/webrtc/trunk/webrtc/modules/video_render/ios/open_gles20.mm
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_channel.h
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_channel.mm
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_gles20.h
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_gles20.mm
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_impl.h
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_impl.mm
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_view.h
media/webrtc/trunk/webrtc/modules/video_render/ios/video_render_ios_view.mm
media/webrtc/trunk/webrtc/modules/video_render/linux/video_render_linux_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/linux/video_render_linux_impl.h
media/webrtc/trunk/webrtc/modules/video_render/linux/video_x11_channel.cc
media/webrtc/trunk/webrtc/modules/video_render/linux/video_x11_channel.h
media/webrtc/trunk/webrtc/modules/video_render/linux/video_x11_render.cc
media/webrtc/trunk/webrtc/modules/video_render/linux/video_x11_render.h
media/webrtc/trunk/webrtc/modules/video_render/mac/cocoa_full_screen_window.h
media/webrtc/trunk/webrtc/modules/video_render/mac/cocoa_full_screen_window.mm
media/webrtc/trunk/webrtc/modules/video_render/mac/cocoa_render_view.h
media/webrtc/trunk/webrtc/modules/video_render/mac/cocoa_render_view.mm
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_agl.cc
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_agl.h
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_mac_carbon_impl.h
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.h
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_mac_cocoa_impl.mm
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_nsopengl.h
media/webrtc/trunk/webrtc/modules/video_render/mac/video_render_nsopengl.mm
media/webrtc/trunk/webrtc/modules/video_render/test/testAPI/renderStartImage.bmp
media/webrtc/trunk/webrtc/modules/video_render/test/testAPI/testAPI.cc
media/webrtc/trunk/webrtc/modules/video_render/test/testAPI/testAPI.h
media/webrtc/trunk/webrtc/modules/video_render/test/testAPI/testAPI_android.cc
media/webrtc/trunk/webrtc/modules/video_render/test/testAPI/testAPI_mac.mm
media/webrtc/trunk/webrtc/modules/video_render/video_render.gypi
media/webrtc/trunk/webrtc/modules/video_render/video_render.h
media/webrtc/trunk/webrtc/modules/video_render/video_render_defines.h
media/webrtc/trunk/webrtc/modules/video_render/video_render_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/video_render_impl.h
media/webrtc/trunk/webrtc/modules/video_render/video_render_internal.h
media/webrtc/trunk/webrtc/modules/video_render/video_render_internal_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/windows/i_video_render_win.h
media/webrtc/trunk/webrtc/modules/video_render/windows/video_render_direct3d9.cc
media/webrtc/trunk/webrtc/modules/video_render/windows/video_render_direct3d9.h
media/webrtc/trunk/webrtc/modules/video_render/windows/video_render_windows_impl.cc
media/webrtc/trunk/webrtc/modules/video_render/windows/video_render_windows_impl.h
media/webrtc/trunk/webrtc/modules/video_render_tests.isolate
media/webrtc/trunk/webrtc/p2p/base/constants.cc
media/webrtc/trunk/webrtc/p2p/base/constants.h
media/webrtc/trunk/webrtc/p2p/base/dtlstransport.h
media/webrtc/trunk/webrtc/p2p/base/p2ptransport.cc
media/webrtc/trunk/webrtc/p2p/base/p2ptransport.h
media/webrtc/trunk/webrtc/p2p/base/rawtransport.cc
media/webrtc/trunk/webrtc/p2p/base/rawtransport.h
media/webrtc/trunk/webrtc/p2p/base/rawtransportchannel.cc
media/webrtc/trunk/webrtc/p2p/base/rawtransportchannel.h
media/webrtc/trunk/webrtc/p2p/base/sessionid.h
media/webrtc/trunk/webrtc/p2p/base/transport.cc
media/webrtc/trunk/webrtc/p2p/base/transport_unittest.cc
media/webrtc/trunk/webrtc/p2p/client/autoportallocator.h
media/webrtc/trunk/webrtc/p2p/client/fakeportallocator.h
media/webrtc/trunk/webrtc/p2p/client/httpportallocator.cc
media/webrtc/trunk/webrtc/p2p/client/httpportallocator.h
media/webrtc/trunk/webrtc/p2p/client/portallocator_unittest.cc
media/webrtc/trunk/webrtc/p2p/p2p.gyp
media/webrtc/trunk/webrtc/p2p/p2p_tests.gypi
media/webrtc/trunk/webrtc/p2p/stunprober/main.cc
media/webrtc/trunk/webrtc/pc/pc.gyp
media/webrtc/trunk/webrtc/rtc_unittests.isolate
media/webrtc/trunk/webrtc/sound/OWNERS
media/webrtc/trunk/webrtc/sound/alsasoundsystem.cc
media/webrtc/trunk/webrtc/sound/alsasoundsystem.h
media/webrtc/trunk/webrtc/sound/alsasymboltable.cc
media/webrtc/trunk/webrtc/sound/alsasymboltable.h
media/webrtc/trunk/webrtc/sound/automaticallychosensoundsystem.h
media/webrtc/trunk/webrtc/sound/automaticallychosensoundsystem_unittest.cc
media/webrtc/trunk/webrtc/sound/linuxsoundsystem.cc
media/webrtc/trunk/webrtc/sound/linuxsoundsystem.h
media/webrtc/trunk/webrtc/sound/nullsoundsystem.cc
media/webrtc/trunk/webrtc/sound/nullsoundsystem.h
media/webrtc/trunk/webrtc/sound/nullsoundsystemfactory.cc
media/webrtc/trunk/webrtc/sound/nullsoundsystemfactory.h
media/webrtc/trunk/webrtc/sound/platformsoundsystem.cc
media/webrtc/trunk/webrtc/sound/platformsoundsystem.h
media/webrtc/trunk/webrtc/sound/platformsoundsystemfactory.cc
media/webrtc/trunk/webrtc/sound/platformsoundsystemfactory.h
media/webrtc/trunk/webrtc/sound/pulseaudiosoundsystem.cc
media/webrtc/trunk/webrtc/sound/pulseaudiosoundsystem.h
media/webrtc/trunk/webrtc/sound/pulseaudiosymboltable.cc
media/webrtc/trunk/webrtc/sound/pulseaudiosymboltable.h
media/webrtc/trunk/webrtc/sound/sound.gyp
media/webrtc/trunk/webrtc/sound/sound_tests.gypi
media/webrtc/trunk/webrtc/sound/sounddevicelocator.h
media/webrtc/trunk/webrtc/sound/soundinputstreaminterface.cc
media/webrtc/trunk/webrtc/sound/soundinputstreaminterface.h
media/webrtc/trunk/webrtc/sound/soundoutputstreaminterface.cc
media/webrtc/trunk/webrtc/sound/soundoutputstreaminterface.h
media/webrtc/trunk/webrtc/sound/soundsystemfactory.h
media/webrtc/trunk/webrtc/sound/soundsysteminterface.cc
media/webrtc/trunk/webrtc/sound/soundsysteminterface.h
media/webrtc/trunk/webrtc/sound/soundsystemproxy.cc
media/webrtc/trunk/webrtc/sound/soundsystemproxy.h
media/webrtc/trunk/webrtc/stream.h
media/webrtc/trunk/webrtc/supplement.gypi
media/webrtc/trunk/webrtc/system_wrappers/cpu_features_chromium.gyp
media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp
media/webrtc/trunk/webrtc/system_wrappers/include/condition_variable_wrapper.h
media/webrtc/trunk/webrtc/system_wrappers/include/data_log.h
media/webrtc/trunk/webrtc/system_wrappers/include/data_log_c.h
media/webrtc/trunk/webrtc/system_wrappers/include/data_log_impl.h
media/webrtc/trunk/webrtc/system_wrappers/include/ref_count.h
media/webrtc/trunk/webrtc/system_wrappers/include/rtp_to_ntp.h
media/webrtc/trunk/webrtc/system_wrappers/include/scoped_vector.h
media/webrtc/trunk/webrtc/system_wrappers/include/sort.h
media/webrtc/trunk/webrtc/system_wrappers/include/stl_util.h
media/webrtc/trunk/webrtc/system_wrappers/include/tick_util.h
media/webrtc/trunk/webrtc/system_wrappers/source/OWNERS
media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_mac.cc
media/webrtc/trunk/webrtc/system_wrappers/source/atomic32_posix.cc
media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable.cc
media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_native_win.cc
media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_native_win.h
media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.cc
media/webrtc/trunk/webrtc/system_wrappers/source/condition_variable_posix.h
media/webrtc/trunk/webrtc/system_wrappers/source/critical_section.cc
media/webrtc/trunk/webrtc/system_wrappers/source/critical_section_posix.cc
media/webrtc/trunk/webrtc/system_wrappers/source/critical_section_posix.h
media/webrtc/trunk/webrtc/system_wrappers/source/critical_section_win.cc
media/webrtc/trunk/webrtc/system_wrappers/source/critical_section_win.h
media/webrtc/trunk/webrtc/system_wrappers/source/data_log.cc
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_c.cc
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_c_helpers_unittest.c
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_c_helpers_unittest.h
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_helpers_unittest.cc
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_no_op.cc
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_unittest.cc
media/webrtc/trunk/webrtc/system_wrappers/source/data_log_unittest_disabled.cc
media/webrtc/trunk/webrtc/system_wrappers/source/file_impl.h
media/webrtc/trunk/webrtc/system_wrappers/source/rtp_to_ntp.cc
media/webrtc/trunk/webrtc/system_wrappers/source/rtp_to_ntp_unittest.cc
media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_generic.cc
media/webrtc/trunk/webrtc/system_wrappers/source/rw_lock_generic.h
media/webrtc/trunk/webrtc/system_wrappers/source/scoped_vector_unittest.cc
media/webrtc/trunk/webrtc/system_wrappers/source/sort.cc
media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/constants.hpp
media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
media/webrtc/trunk/webrtc/system_wrappers/source/stl_util_unittest.cc
media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_tests.gyp
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers_unittests.isolate
media/webrtc/trunk/webrtc/system_wrappers/test/TestSort/TestSort.cc
media/webrtc/trunk/webrtc/test/channel_transport/OWNERS
media/webrtc/trunk/webrtc/test/channel_transport/channel_transport.cc
media/webrtc/trunk/webrtc/test/channel_transport/channel_transport.h
media/webrtc/trunk/webrtc/test/channel_transport/traffic_control_win.cc
media/webrtc/trunk/webrtc/test/channel_transport/traffic_control_win.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket2_manager_win.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket2_manager_win.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket2_win.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket2_win.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_manager_posix.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_manager_posix.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_manager_unittest.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_manager_wrapper.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_manager_wrapper.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_posix.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_posix.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_wrapper.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_wrapper.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_transport.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_transport_impl.cc
media/webrtc/trunk/webrtc/test/channel_transport/udp_transport_impl.h
media/webrtc/trunk/webrtc/test/channel_transport/udp_transport_unittest.cc
media/webrtc/trunk/webrtc/test/common_unittest.cc
media/webrtc/trunk/webrtc/test/fuzzers/producer_fec_fuzzer.cc
media/webrtc/trunk/webrtc/test/fuzzers/webrtc_fuzzer.gni
media/webrtc/trunk/webrtc/test/histogram.cc
media/webrtc/trunk/webrtc/test/histogram.h
media/webrtc/trunk/webrtc/test/metrics.gyp
media/webrtc/trunk/webrtc/test/run_all_unittests.cc
media/webrtc/trunk/webrtc/test/test.gyp
media/webrtc/trunk/webrtc/test/test_suite.cc
media/webrtc/trunk/webrtc/test/test_suite.h
media/webrtc/trunk/webrtc/test/test_support_unittests.isolate
media/webrtc/trunk/webrtc/test/testsupport/gtest_prod_util.h
media/webrtc/trunk/webrtc/test/testsupport/mac/run_threaded_main_mac.h
media/webrtc/trunk/webrtc/test/testsupport/mac/run_threaded_main_mac.mm
media/webrtc/trunk/webrtc/test/video_capturer.cc
media/webrtc/trunk/webrtc/test/webrtc_test_common.gyp
media/webrtc/trunk/webrtc/tools/agc/agc_harness.cc
media/webrtc/trunk/webrtc/tools/agc/fake_agc.h
media/webrtc/trunk/webrtc/tools/agc/test_utils.cc
media/webrtc/trunk/webrtc/tools/agc/test_utils.h
media/webrtc/trunk/webrtc/tools/author_line_count.sh
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/README
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/daemon.conf
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/default.pa
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/perf/__init__.py
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/perf/perf_utils.py
media/webrtc/trunk/webrtc/tools/e2e_quality/audio/run_audio_test.py
media/webrtc/trunk/webrtc/tools/header_usage.sh
media/webrtc/trunk/webrtc/tools/internal_tools.gyp
media/webrtc/trunk/webrtc/tools/py_event_log_analyzer/misc_test.py
media/webrtc/trunk/webrtc/tools/py_event_log_analyzer/rtp_analyzer.sh
media/webrtc/trunk/webrtc/tools/py_event_log_analyzer/rtp_analyzer_test.py
media/webrtc/trunk/webrtc/tools/tools.gyp
media/webrtc/trunk/webrtc/tools/tools_unittests.isolate
media/webrtc/trunk/webrtc/transport.h
media/webrtc/trunk/webrtc/video/encoded_frame_callback_adapter.cc
media/webrtc/trunk/webrtc/video/encoded_frame_callback_adapter.h
media/webrtc/trunk/webrtc/video/encoder_state_feedback.cc
media/webrtc/trunk/webrtc/video/encoder_state_feedback.h
media/webrtc/trunk/webrtc/video/encoder_state_feedback_unittest.cc
media/webrtc/trunk/webrtc/video/full_stack.cc
media/webrtc/trunk/webrtc/video/full_stack_plot.py
media/webrtc/trunk/webrtc/video/full_stack_tests_plot.py
media/webrtc/trunk/webrtc/video/video_capture_input.cc
media/webrtc/trunk/webrtc/video/video_capture_input.h
media/webrtc/trunk/webrtc/video/video_capture_input_unittest.cc
media/webrtc/trunk/webrtc/video/video_decoder.cc
media/webrtc/trunk/webrtc/video/video_decoder_unittest.cc
media/webrtc/trunk/webrtc/video/video_encoder.cc
media/webrtc/trunk/webrtc/video/video_encoder_unittest.cc
media/webrtc/trunk/webrtc/video/vie_channel.cc
media/webrtc/trunk/webrtc/video/vie_channel.h
media/webrtc/trunk/webrtc/video/vie_codec_unittest.cc
media/webrtc/trunk/webrtc/video/vie_receiver.cc
media/webrtc/trunk/webrtc/video/vie_receiver.h
media/webrtc/trunk/webrtc/video/vie_sync_module.cc
media/webrtc/trunk/webrtc/video/vie_sync_module.h
media/webrtc/trunk/webrtc/video/webrtc_video.gypi
media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.cc
media/webrtc/trunk/webrtc/video_engine/desktop_capture_impl.h
media/webrtc/trunk/webrtc/video_engine_tests.isolate
media/webrtc/trunk/webrtc/video_renderer.h
media/webrtc/trunk/webrtc/voice_engine/dtmf_inband.cc
media/webrtc/trunk/webrtc/voice_engine/dtmf_inband.h
media/webrtc/trunk/webrtc/voice_engine/dtmf_inband_queue.cc
media/webrtc/trunk/webrtc/voice_engine/dtmf_inband_queue.h
media/webrtc/trunk/webrtc/voice_engine/include/voe_dtmf.h
media/webrtc/trunk/webrtc/voice_engine/network_predictor.cc
media/webrtc/trunk/webrtc/voice_engine/network_predictor.h
media/webrtc/trunk/webrtc/voice_engine/network_predictor_unittest.cc
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/.classpath
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/AndroidManifest.xml
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/default.properties
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/gen/org/webrtc/voiceengine/test/R.java
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/jni/android_test.cc
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/res/drawable/icon.png
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/res/layout/main.xml
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/res/values/strings.xml
media/webrtc/trunk/webrtc/voice_engine/test/android/android_test/src/org/webrtc/voiceengine/test/AndroidTest.java
media/webrtc/trunk/webrtc/voice_engine/test/auto_test/resource_manager.cc
media/webrtc/trunk/webrtc/voice_engine/test/auto_test/resource_manager.h
media/webrtc/trunk/webrtc/voice_engine/voe_auto_test.isolate
media/webrtc/trunk/webrtc/voice_engine/voe_dtmf_impl.cc
media/webrtc/trunk/webrtc/voice_engine/voe_dtmf_impl.h
media/webrtc/trunk/webrtc/voice_engine/voice_engine.gyp
media/webrtc/trunk/webrtc/voice_engine/voice_engine_unittests.isolate
media/webrtc/trunk/webrtc/webrtc.gyp
media/webrtc/trunk/webrtc/webrtc_examples.gyp
media/webrtc/trunk/webrtc/webrtc_nonparallel_tests.isolate
media/webrtc/trunk/webrtc/webrtc_perf_tests.isolate
media/webrtc/trunk/webrtc/webrtc_tests.gypi
mobile/android/base/moz.build
security/nss/automation/clang-format/run_clang_format.sh
security/nss/automation/taskcluster/scripts/run_clang_format.sh
security/nss/lib/freebl/mpi/Makefile
security/nss/lib/freebl/mpi/Makefile.os2
security/nss/lib/freebl/mpi/Makefile.win
security/nss/lib/freebl/mpi/all-tests
security/nss/lib/freebl/mpi/hppatch.adb
security/nss/lib/freebl/mpi/make-logtab
security/nss/lib/freebl/mpi/make-test-arrays
security/nss/lib/freebl/mpi/mdxptest.c
security/nss/lib/freebl/mpi/multest
security/nss/lib/freebl/mpi/stats
security/nss/lib/freebl/mpi/target.mk
security/nss/lib/freebl/mpi/test-arrays.txt
security/nss/lib/freebl/mpi/tests/LICENSE
security/nss/lib/freebl/mpi/tests/LICENSE-MPL
security/nss/lib/freebl/mpi/tests/mptest-1.c
security/nss/lib/freebl/mpi/tests/mptest-2.c
security/nss/lib/freebl/mpi/tests/mptest-3.c
security/nss/lib/freebl/mpi/tests/mptest-3a.c
security/nss/lib/freebl/mpi/tests/mptest-4.c
security/nss/lib/freebl/mpi/tests/mptest-4a.c
security/nss/lib/freebl/mpi/tests/mptest-4b.c
security/nss/lib/freebl/mpi/tests/mptest-5.c
security/nss/lib/freebl/mpi/tests/mptest-5a.c
security/nss/lib/freebl/mpi/tests/mptest-6.c
security/nss/lib/freebl/mpi/tests/mptest-7.c
security/nss/lib/freebl/mpi/tests/mptest-8.c
security/nss/lib/freebl/mpi/tests/mptest-9.c
security/nss/lib/freebl/mpi/tests/mptest-b.c
security/nss/lib/freebl/mpi/tests/pi1k.txt
security/nss/lib/freebl/mpi/tests/pi2k.txt
security/nss/lib/freebl/mpi/tests/pi5k.txt
security/nss/lib/freebl/mpi/timetest
security/nss/lib/freebl/mpi/types.pl
security/nss/lib/freebl/mpi/utils/LICENSE
security/nss/lib/freebl/mpi/utils/LICENSE-MPL
security/nss/lib/freebl/mpi/utils/PRIMES
security/nss/lib/freebl/mpi/utils/README
security/nss/lib/freebl/mpi/utils/basecvt.c
security/nss/lib/freebl/mpi/utils/bbs_rand.c
security/nss/lib/freebl/mpi/utils/bbs_rand.h
security/nss/lib/freebl/mpi/utils/bbsrand.c
security/nss/lib/freebl/mpi/utils/dec2hex.c
security/nss/lib/freebl/mpi/utils/exptmod.c
security/nss/lib/freebl/mpi/utils/fact.c
security/nss/lib/freebl/mpi/utils/gcd.c
security/nss/lib/freebl/mpi/utils/hex2dec.c
security/nss/lib/freebl/mpi/utils/identest.c
security/nss/lib/freebl/mpi/utils/invmod.c
security/nss/lib/freebl/mpi/utils/isprime.c
security/nss/lib/freebl/mpi/utils/lap.c
security/nss/lib/freebl/mpi/utils/makeprime.c
security/nss/lib/freebl/mpi/utils/metime.c
security/nss/lib/freebl/mpi/utils/pi.c
security/nss/lib/freebl/mpi/utils/primegen.c
security/nss/lib/freebl/mpi/utils/prng.c
security/nss/lib/freebl/mpi/utils/ptab.pl
security/nss/lib/freebl/mpi/utils/sieve.c
security/nss/mach
testing/web-platform/meta/dom/nodes/Document-characterSet-normalization.html.ini
testing/web-platform/meta/encoding/iso-2022-jp-decoder.html.ini
testing/web-platform/meta/encoding/single-byte-decoder.html.ini
testing/web-platform/meta/encoding/textdecoder-labels.html.ini
testing/web-platform/meta/eventsource/format-bom-2.htm.ini
testing/web-platform/meta/html/semantics/forms/the-textarea-element/value-defaultValue-textContent.html.ini
testing/web-platform/meta/url/urlencoded-parser.html.ini
third_party/rust/simd/benches/mandelbrot.rs
third_party/rust/simd/benches/matrix.rs
third_party/rust/simd/examples/axpy.rs
third_party/rust/simd/examples/dot-product.rs
third_party/rust/simd/examples/fannkuch-redux.rs
third_party/rust/simd/examples/mandelbrot.rs
third_party/rust/simd/examples/nbody.rs
third_party/rust/simd/examples/spectral-norm.rs
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,10 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-
-Merge day clobber
\ No newline at end of file
+Bug 1341285: From experience, due to all the build changes in a webrtc.org landing make a clobber usually necessary
--- a/accessible/base/FocusManager.cpp
+++ b/accessible/base/FocusManager.cpp
@@ -186,31 +186,29 @@ FocusManager::ActiveItemChanged(Accessib
     if (logging::IsEnabled(logging::eFocus))
       logging::ActiveWidget(widget);
 #endif
     if (!widget || !widget->IsActiveWidget() || !widget->AreItemsOperable())
       return;
   }
   mActiveItem = aItem;
 
-  // If mActiveItem is null, we might need to shift a11y focus to a remote
-  // element.
+  // If mActiveItem is null we may need to shift a11y focus back to a tab
+  // document. For example, when combobox popup is closed, then
+  // the focus should be moved back to the combobox.
   if (!mActiveItem && XRE_IsParentProcess()) {
     nsFocusManager* domfm = nsFocusManager::GetFocusManager();
     if (domfm) {
       nsIContent* focusedElm = domfm->GetFocusedContent();
-      if (focusedElm) {
-        bool remote = EventStateManager::IsRemoteTarget(focusedElm);
-        if (remote) {
-          dom::TabParent* tab = dom::TabParent::GetFrom(focusedElm);
-          if (tab) {
-            a11y::DocAccessibleParent* dap = tab->GetTopLevelDocAccessible();
-            if (dap) {
-              Unused << dap->SendRestoreFocus();
-            }
+      if (EventStateManager::IsRemoteTarget(focusedElm)) {
+        dom::TabParent* tab = dom::TabParent::GetFrom(focusedElm);
+        if (tab) {
+          a11y::DocAccessibleParent* dap = tab->GetTopLevelDocAccessible();
+          if (dap) {
+            Unused << dap->SendRestoreFocus();
           }
         }
       }
     }
   }
 
   // If active item is changed then fire accessible focus event on it, otherwise
   // if there's no an active item then fire focus event to accessible having
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -154,17 +154,21 @@ pref("app.update.auto", true);
 
 // If set to true, the Update Service will present no UI for any event.
 pref("app.update.silent", false);
 
 // app.update.badgeWaitTime is in branding section
 
 // If set to true, the Update Service will apply updates in the background
 // when it finishes downloading them.
+#ifdef XP_WIN
+pref("app.update.staging.enabled", false);
+#else
 pref("app.update.staging.enabled", true);
+#endif
 
 // Update service URL:
 pref("app.update.url", "https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
 // app.update.url.manual is in branding section
 // app.update.url.details is in branding section
 
 // app.update.interval is in branding section
 // app.update.promptWaitTime is in branding section
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -37,16 +37,17 @@
   <body dir="&locale.dir;">
     <div class="spacer"/>
     <div id="topSection">
       <div id="brandLogo"></div>
 
       <div id="searchIconAndTextContainer">
         <div id="searchIcon"/>
         <input type="text" name="q" value="" id="searchText" maxlength="256"
+               placeholder="&searchInput.placeholder;"
                aria-label="&contentSearchInput.label;" autofocus="autofocus"/>
         <input id="searchSubmit" type="button" onclick="onSearchSubmit(event)"
                title="&contentSearchSubmit.tooltip;"/>
       </div>
 
       <div id="snippetContainer">
         <div id="defaultSnippets" hidden="true">
           <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span>
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -321,22 +321,22 @@ var gSync = {
         fragment.appendChild(targetDevice);
       }
 
       const clients = this.remoteClients;
       for (let client of clients) {
         addTargetDevice(client.id, client.name, client.type);
       }
 
-      // "All devices" menu item
+      // "Send to All Devices" menu item
       if (clients.length > 1) {
         const separator = createDeviceNodeFn();
         separator.classList.add("sync-menuitem");
         fragment.appendChild(separator);
-        const allDevicesLabel = this.fxaStrings.GetStringFromName("sendTabToAllDevices.menuitem");
+        const allDevicesLabel = this.fxaStrings.GetStringFromName("sendToAllDevices.menuitem");
         addTargetDevice("", allDevicesLabel, "");
       }
     }
     devicesPopup.appendChild(fragment);
   },
 
   isSendableURI(aURISpec) {
     if (!aURISpec) {
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7,21 +7,22 @@
 
 var Ci = Components.interfaces;
 var Cu = Components.utils;
 var Cc = Components.classes;
 var Cr = Components.results;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/ContextualIdentityService.jsm");
 Cu.import("resource://gre/modules/NotificationDB.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Preferences",
                                   "resource://gre/modules/Preferences.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
+                                  "resource://gre/modules/ContextualIdentityService.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "extensionNameFromURI", () => {
   return Cu.import("resource://gre/modules/ExtensionParent.jsm", {}).extensionNameFromURI;
 });
 
 // lazy module getters
 
 /* global AboutHome:false,
--- a/browser/base/content/contentSearchUI.js
+++ b/browser/base/content/contentSearchUI.js
@@ -594,17 +594,16 @@ ContentSearchUIController.prototype = {
   },
 
   _onMsgStrings(strings) {
     this._strings = strings;
     this._updateDefaultEngineHeader();
     this._updateSearchWithHeader();
     document.getElementById("contentSearchSettingsButton").textContent =
       this._strings.searchSettings;
-    this.input.setAttribute("placeholder", this._strings.searchPlaceholder);
   },
 
   _updateDefaultEngineHeader() {
     let header = document.getElementById("contentSearchDefaultEngineHeader");
     header.firstChild.setAttribute("src", this.defaultEngine.icon);
     if (!this._strings) {
       return;
     }
--- a/browser/base/content/newtab/newTab.xhtml
+++ b/browser/base/content/newtab/newTab.xhtml
@@ -66,17 +66,18 @@
         <button id="newtab-undo-close-button" tabindex="-1" title="&newtab.undo.closeTooltip;"/>
       </div>
     </div>
 
     <div id="newtab-search-container">
       <div id="newtab-search-form">
         <div id="newtab-search-icon"/>
         <input type="text" name="q" value="" id="newtab-search-text"
-             aria-label="&contentSearchInput.label;" maxlength="256"/>
+               placeholder="&searchInput.placeholder;"
+               aria-label="&contentSearchInput.label;" maxlength="256"/>
         <input id="newtab-search-submit" type="button"
              title="&contentSearchSubmit.tooltip;"/>
       </div>
     </div>
 
     <div id="newtab-horizontal-margin">
       <div class="newtab-side-margin"/>
       <div id="newtab-grid">
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1,27 +1,28 @@
 /* -*- tab-width: 2; indent-tabs-mode: nil; js-indent-level: 2 -*- */
 /* vim: set ts=2 sw=2 sts=2 et tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-Components.utils.import("resource://gre/modules/ContextualIdentityService.jsm");
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 Components.utils.import("resource://gre/modules/InlineSpellChecker.jsm");
 Components.utils.import("resource://gre/modules/LoginManagerContextMenu.jsm");
 Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
   "resource://gre/modules/LoginHelper.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "WebNavigationFrames",
   "resource://gre/modules/WebNavigationFrames.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
+  "resource://gre/modules/ContextualIdentityService.jsm");
 
 var gContextMenuContentData = null;
 
 function openContextMenu(aMessage) {
   let data = aMessage.data;
   let browser = aMessage.target;
 
   let spellInfo = data.spellInfo;
--- a/browser/base/content/test/performance/browser_startup.js
+++ b/browser/base/content/test/performance/browser_startup.js
@@ -51,16 +51,22 @@ const startupPhases = {
 
   // We reach this phase right after showing the first browser window.
   // This means that anything already loaded at this point has been loaded
   // before first paint and delayed it.
   "before first paint": {blacklist: {
     components: new Set([
       "nsSearchService.js",
       "UnifiedComplete.js",
+    ]),
+    modules: new Set([
+     "resource://gre/modules/ContextualIdentityService.jsm"
+    ]),
+    services: new Set([
+      "@mozilla.org/browser/search-service;1",
     ])
   }},
 
   // We are at this phase once we are ready to handle user events.
   // Anything loaded at this phase or before gets in the way of the user
   // interacting with the first browser window.
   "before handling user events": {},
 };
@@ -97,17 +103,17 @@ function test() {
     }
     previous = phase;
   }
 
   for (let phase in startupPhases) {
     let loadedList = data[phase];
     let whitelist = startupPhases[phase].whitelist || null;
     if (whitelist) {
-      for (let scriptType in loadedList) {
+      for (let scriptType in whitelist) {
         loadedList[scriptType] = loadedList[scriptType].filter(c => {
           if (!whitelist[scriptType].has(c))
             return true;
           whitelist[scriptType].delete(c);
           return false;
         });
         is(loadedList[scriptType].length, 0,
            `should have no unexpected ${scriptType} loaded ${phase}`);
--- a/browser/base/content/test/sync/browser_contextmenu_sendpage.js
+++ b/browser/base/content/test/sync/browser_contextmenu_sendpage.js
@@ -15,17 +15,17 @@ add_task(async function setup() {
 
 add_task(async function test_page_contextmenu() {
   await updateContentContextMenu("#moztext", "context-sendpagetodevice");
   is(document.getElementById("context-sendpagetodevice").hidden, false, "Send tab to device is shown");
   is(document.getElementById("context-sendpagetodevice").disabled, false, "Send tab to device is enabled");
   let devices = document.getElementById("context-sendpagetodevice-popup").childNodes;
   is(devices[0].getAttribute("label"), "Foo", "Foo target is present");
   is(devices[1].getAttribute("label"), "Bar", "Bar target is present");
-  is(devices[3].getAttribute("label"), "All Devices", "All Devices target is present");
+  is(devices[3].getAttribute("label"), "Send to All Devices", "All Devices target is present");
 });
 
 add_task(async function test_page_contextmenu_notsendable() {
   const isSendableURIMock = mockReturn(gSync, "isSendableURI", false);
 
   await updateContentContextMenu("#moztext");
   is(document.getElementById("context-sendpagetodevice").hidden, true, "Send tab to device is hidden");
   is(document.getElementById("context-sendpagetodevice").disabled, false, "Send tab to device is enabled");
--- a/browser/base/content/test/sync/browser_contextmenu_sendtab.js
+++ b/browser/base/content/test/sync/browser_contextmenu_sendtab.js
@@ -20,17 +20,17 @@ add_task(async function setup() {
 
 add_task(async function test_tab_contextmenu() {
   await updateTabContextMenu(testTab, openSendTabTargetsSubmenu);
   is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
   is(document.getElementById("context_sendTabToDevice").disabled, false, "Send tab to device is enabled");
   let devices = document.getElementById("context_sendTabToDevicePopupMenu").childNodes;
   is(devices[0].getAttribute("label"), "Foo", "Foo target is present");
   is(devices[1].getAttribute("label"), "Bar", "Bar target is present");
-  is(devices[3].getAttribute("label"), "All Devices", "All Devices target is present");
+  is(devices[3].getAttribute("label"), "Send to All Devices", "All Devices target is present");
 });
 
 add_task(async function test_tab_contextmenu_only_one_remote_device() {
   const remoteClientsMock = mockReturn(gSync, "remoteClients", [{ id: 1, name: "Foo"}]);
 
   await updateTabContextMenu(testTab, openSendTabTargetsSubmenu);
   is(document.getElementById("context_sendTabToDevice").hidden, false, "Send tab to device is shown");
   is(document.getElementById("context_sendTabToDevice").disabled, false, "Send tab to device is enabled");
--- a/browser/base/content/test/urlbar/browser_page_action_menu.js
+++ b/browser/base/content/test/urlbar/browser_page_action_menu.js
@@ -218,17 +218,17 @@ add_task(async function sendToDevice_syn
               label: client.name,
               clientType: client.type,
             },
           });
         }
         expectedItems.push(
           null,
           {
-            label: "All Devices",
+            label: "Send to All Devices",
           }
         );
         checkSendToDeviceItems(expectedItems);
       } else {
         ok(false, "This should never happen");
       }
     }
 
@@ -388,17 +388,17 @@ add_task(async function sendToDevice_dev
           label: client.name,
           clientType: client.type,
         },
       });
     }
     expectedItems.push(
       null,
       {
-        label: "All Devices",
+        label: "Send to All Devices",
       }
     );
     checkSendToDeviceItems(expectedItems);
 
     // Done, hide the panel.
     let hiddenPromise = promisePanelHidden();
     gPanel.hidePopup();
     await hiddenPromise;
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -1,24 +1,26 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Services = object with smart getters for common XPCOM services
 Components.utils.import("resource://gre/modules/AppConstants.jsm");
-Components.utils.import("resource://gre/modules/ContextualIdentityService.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 Components.utils.import("resource:///modules/RecentWindow.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "ShellService",
                                   "resource:///modules/ShellService.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
+                                  "resource://gre/modules/ContextualIdentityService.jsm");
+
 XPCOMUtils.defineLazyServiceGetter(this, "aboutNewTabService",
                                    "@mozilla.org/browser/aboutnewtab-service;1",
                                    "nsIAboutNewTabService");
 
 Object.defineProperty(this, "BROWSER_NEW_TAB_URL", {
   configurable: true,
   enumerable: true,
   get() {
--- a/browser/components/migration/360seProfileMigrator.js
+++ b/browser/components/migration/360seProfileMigrator.js
@@ -229,17 +229,17 @@ Object.defineProperty(Qihoo360seProfileM
       loginIni.append("login.ini");
       if (!loginIni.exists()) {
         throw new Error("360 Secure Browser's 'login.ini' does not exist.");
       }
       if (!loginIni.isReadable()) {
         throw new Error("360 Secure Browser's 'login.ini' file could not be read.");
       }
 
-      let loginIniInUtf8 = copyToTempUTF8File(loginIni, "gbk");
+      let loginIniInUtf8 = copyToTempUTF8File(loginIni, "GBK");
       let loginIniObj = parseINIStrings(loginIniInUtf8);
       try {
         loginIniInUtf8.remove(false);
       } catch (ex) {}
 
       let nowLoginEmail = loginIniObj.NowLogin && loginIniObj.NowLogin.email;
 
       /*
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -14,16 +14,18 @@ Cu.import("resource://gre/modules/Servic
 Cu.import("resource://gre/modules/AppConstants.jsm");
 Cu.import("resource://gre/modules/AsyncPrefs.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "WindowsUIUtils", "@mozilla.org/windows-ui-utils;1", "nsIWindowsUIUtils");
 XPCOMUtils.defineLazyServiceGetter(this, "AlertsService", "@mozilla.org/alerts-service;1", "nsIAlertsService");
 XPCOMUtils.defineLazyGetter(this, "WeaveService", () =>
   Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject
 );
+XPCOMUtils.defineLazyModuleGetter(this, "ContextualIdentityService",
+                                  "resource://gre/modules/ContextualIdentityService.jsm");
 
 // lazy module getters
 
 /* global AboutHome:false, AboutNewTab:false, AddonManager:false, AppMenuNotifications:false,
           AsyncShutdown:false, AutoCompletePopup:false, BookmarkHTMLUtils:false,
           BookmarkJSONUtils:false, BrowserUITelemetry:false, BrowserUsageTelemetry:false,
           ContentClick:false, ContentPrefServiceParent:false, ContentSearch:false,
           DateTimePickerHelper:false, DirectoryLinksProvider:false,
@@ -596,39 +598,31 @@ BrowserGlue.prototype = {
     // apply distribution customizations (prefs)
     // other customizations are applied in _finalUIStartup()
     this._distributionCustomizer.applyPrefDefaults();
   },
 
   // runs on startup, before the first command line handler is invoked
   // (i.e. before the first window is opened)
   _finalUIStartup: function BG__finalUIStartup() {
-    this._sanitizer.onStartup();
     // check if we're in safe mode
     if (Services.appinfo.inSafeMode) {
       Services.ww.openWindow(null, "chrome://browser/content/safeMode.xul",
                              "_blank", "chrome,centerscreen,modal,resizable=no", null);
     }
 
     // apply distribution customizations
     // prefs are applied in _onAppDefaults()
     this._distributionCustomizer.applyCustomizations();
 
     // handle any UI migration
     this._migrateUI();
 
     listeners.init();
 
-    PageThumbs.init();
-
-    DirectoryLinksProvider.init();
-    NewTabUtils.init();
-    NewTabUtils.links.addProvider(DirectoryLinksProvider);
-    AboutNewTab.init();
-
     SessionStore.init();
     BrowserUsageTelemetry.init();
     BrowserUITelemetry.init();
 
     if (AppConstants.INSTALL_COMPACT_THEMES) {
       let vendorShortName = gBrandBundle.GetStringFromName("vendorShortName");
 
       LightweightThemeManager.addBuiltInTheme({
@@ -969,16 +963,23 @@ BrowserGlue.prototype = {
 
     AutoCompletePopup.init();
     DateTimePickerHelper.init();
     // Check if Sync is configured
     if (Services.prefs.prefHasUserValue("services.sync.username")) {
       WeaveService.init();
     }
 
+    PageThumbs.init();
+
+    DirectoryLinksProvider.init();
+    NewTabUtils.init();
+    NewTabUtils.links.addProvider(DirectoryLinksProvider);
+    AboutNewTab.init();
+
     this._firstWindowTelemetry(aWindow);
     this._firstWindowLoaded();
 
     this._mediaTelemetryIdleObserver = {
       browserGlue: this,
       observe(aSubject, aTopic, aData) {
         if (aTopic != "idle") {
           return;
@@ -1175,16 +1176,22 @@ BrowserGlue.prototype = {
 
       if (willPrompt) {
         Services.tm.dispatchToMainThread(function() {
           DefaultBrowserCheck.prompt(RecentWindow.getMostRecentBrowserWindow());
         });
       }
     }
 
+    // Let's load the contextual identities.
+    Services.tm.mainThread.idleDispatch(() => {
+      ContextualIdentityService.load();
+    });
+
+    this._sanitizer.onStartup();
     E10SAccessibilityCheck.onWindowsRestored();
   },
 
   _createExtraDefaultProfile() {
     if (!AppConstants.MOZ_DEV_EDITION) {
       return;
     }
     // If Developer Edition is the only installed Firefox version and no other
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -20,25 +20,25 @@
             onbeforeaccept="return gFontsDialog.onBeforeAccept();"
             style="">
 
   <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
   <prefpane id="FontsDialogPane"
             class="largeDialogContainer"
             helpTopic="prefs-fonts-and-colors">
-  
+
     <preferences id="fontPreferences">
       <preference id="font.language.group"  name="font.language.group"  type="wstring"/>
       <preference id="browser.display.use_document_fonts"
                   name="browser.display.use_document_fonts"
                   type="int"/>
       <preference id="intl.charset.fallback.override" name="intl.charset.fallback.override" type="string"/>
     </preferences>
-    
+
     <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
     <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
     <script type="application/javascript" src="chrome://browser/content/preferences/fonts.js"/>
 
     <!-- Fonts for: [ Language ] -->
     <groupbox>
       <caption>
         <hbox align="center">
@@ -74,25 +74,25 @@
             <menuitem value="x-telu"          label="&font.langGroup.telugu;"/>
             <menuitem value="th"              label="&font.langGroup.thai;"/>
             <menuitem value="x-tibt"          label="&font.langGroup.tibetan;"/>
             <menuitem value="x-cans"          label="&font.langGroup.canadian;"/>
             <menuitem value="x-unicode"       label="&font.langGroup.other;"/>
           </menupopup>
         </menulist>
       </caption>
-      
+
       <grid>
         <columns>
           <column/>
           <column flex="1"/>
           <column/>
           <column/>
         </columns>
-        
+
         <rows>
           <row>
             <separator class="thin"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
               <label accesskey="&proportional.accesskey;" control="defaultFontType">&proportional.label;</label>
@@ -102,17 +102,17 @@
                 <menuitem value="serif" label="&useDefaultFontSerif.label;"/>
                 <menuitem value="sans-serif" label="&useDefaultFontSansSerif.label;"/>
               </menupopup>
             </menulist>
             <hbox align="center" pack="end">
               <label value="&size.label;"
                      accesskey="&sizeProportional.accesskey;"
                      control="sizeVar"/>
-            </hbox>  
+            </hbox>
             <menulist id="sizeVar" delayprefsave="true">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
                 <menuitem value="11" label="11"/>
                 <menuitem value="12" label="12"/>
                 <menuitem value="13" label="13"/>
                 <menuitem value="14" label="14"/>
@@ -159,17 +159,17 @@
               <label accesskey="&monospace.accesskey;" control="monospace">&monospace.label;</label>
             </hbox>
             <menulist id="monospace" flex="1" style="width: 0px;" crop="right" delayprefsave="true"
                       onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
             <hbox align="center" pack="end">
               <label value="&size.label;"
                      accesskey="&sizeMonospace.accesskey;"
                      control="sizeMono"/>
-            </hbox>  
+            </hbox>
             <menulist id="sizeMono" delayprefsave="true">
               <menupopup>
                 <menuitem value="9" label="9"/>
                 <menuitem value="10" label="10"/>
                 <menuitem value="11" label="11"/>
                 <menuitem value="12" label="12"/>
                 <menuitem value="13" label="13"/>
                 <menuitem value="14" label="14"/>
@@ -232,17 +232,17 @@
               <menuitem value="72" label="72"/>
             </menupopup>
           </menulist>
         </hbox>
       </hbox>
       <separator/>
       <separator class="groove"/>
       <hbox>
-        <checkbox id="useDocumentFonts" 
+        <checkbox id="useDocumentFonts"
                   label="&allowPagesToUseOwn.label;" accesskey="&allowPagesToUseOwn.accesskey;"
                   preference="browser.display.use_document_fonts"
                   onsyncfrompreference="return gFontsDialog.readUseDocumentFonts();"
                   onsynctopreference="return gFontsDialog.writeUseDocumentFonts();"/>
       </hbox>
     </groupbox>
 
     <!-- Text Encoding -->
@@ -255,16 +255,18 @@
                control="DefaultCharsetList"/>
         <menulist id="DefaultCharsetList" preference="intl.charset.fallback.override">
           <menupopup>
             <menuitem label="&languages.customize.Fallback.auto;"        value=""/>
             <menuitem label="&languages.customize.Fallback.arabic;"      value="windows-1256"/>
             <menuitem label="&languages.customize.Fallback.baltic;"      value="windows-1257"/>
             <menuitem label="&languages.customize.Fallback.ceiso;"       value="ISO-8859-2"/>
             <menuitem label="&languages.customize.Fallback.cewindows;"   value="windows-1250"/>
+            <!-- Using gbk instead of GBK for compat with previously-stored prefs.
+                 The value gets normalized in dom/encoding/FallbackEncoding.cpp. -->
             <menuitem label="&languages.customize.Fallback.simplified;"  value="gbk"/>
             <menuitem label="&languages.customize.Fallback.traditional;" value="Big5"/>
             <menuitem label="&languages.customize.Fallback.cyrillic;"    value="windows-1251"/>
             <menuitem label="&languages.customize.Fallback.greek;"       value="ISO-8859-7"/>
             <menuitem label="&languages.customize.Fallback.hebrew;"      value="windows-1255"/>
             <menuitem label="&languages.customize.Fallback.japanese;"    value="Shift_JIS"/>
             <menuitem label="&languages.customize.Fallback.korean;"      value="EUC-KR"/>
             <menuitem label="&languages.customize.Fallback.thai;"        value="windows-874"/>
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -5,18 +5,16 @@
 
 <!-- This file is imported into the browser window. -->
 <!-- eslint-env mozilla/browser-window -->
 
 <!-- XULCommandEvent is a specialised global. -->
 <!-- global XULCommandEvent -->
 
 <!DOCTYPE bindings [
-<!ENTITY % searchBarDTD SYSTEM "chrome://browser/locale/searchbar.dtd" >
-%searchBarDTD;
 <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
 %browserDTD;
 ]>
 
 <bindings id="SearchBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
@@ -33,16 +31,17 @@
       There is a dependency between "maxrows" attribute and
       "SuggestAutoComplete._historyLimit" (nsSearchSuggestions.js). Changing
       one of them requires changing the other one.
       -->
       <xul:textbox class="searchbar-textbox"
                    anonid="searchbar-textbox"
                    type="autocomplete"
                    inputtype="search"
+                   placeholder="&searchInput.placeholder;"
                    flex="1"
                    autocompletepopup="PopupSearchAutoComplete"
                    autocompletesearch="search-autocomplete"
                    autocompletesearchparam="searchbar-history"
                    maxrows="10"
                    completeselectedindex="true"
                    minresultsforpopup="0"
                    xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines">
@@ -51,32 +50,30 @@
         binding's anonymous children (the autocomplete binding positions <box>
         children differently)
         -->
         <xul:box>
           <xul:hbox class="searchbar-search-button-container">
             <xul:image class="searchbar-search-button"
                        anonid="searchbar-search-button"
                        xbl:inherits="addengines"
-                       tooltiptext="&searchEndCap.label;"/>
+                       tooltiptext="&searchIcon.tooltip;"/>
           </xul:hbox>
         </xul:box>
         <xul:hbox class="search-go-container">
           <xul:image class="search-go-button" hidden="true"
                      anonid="search-go-button"
                      onclick="handleSearchCommand(event);"
-                     tooltiptext="&searchEndCap.label;"/>
+                     tooltiptext="&contentSearchSubmit.tooltip;"/>
         </xul:hbox>
       </xul:textbox>
     </content>
 
     <implementation implements="nsIObserver">
       <constructor><![CDATA[
-        this._textbox.placeholder = this._stringBundle.getString("searchPlaceholder");
-
         if (this.parentNode.parentNode.localName == "toolbarpaletteitem")
           return;
 
         Services.obs.addObserver(this, "browser-search-engine-modified");
 
         this._initialized = true;
 
         (window.delayedStartupPromise || Promise.resolve()).then(() => {
--- a/browser/components/tests/startupRecorder.js
+++ b/browser/components/tests/startupRecorder.js
@@ -1,13 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const {classes: Cc, utils: Cu, interfaces: Ci} = Components;
+const {classes: Cc, utils: Cu, interfaces: Ci, manager: Cm} = Components;
+Cm.QueryInterface(Ci.nsIServiceManager);
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AppConstants.jsm");
 
 let firstPaintNotification = "widget-first-paint";
 // widget-first-paint fires much later than expected on Linux.
 if (AppConstants.platform == "linux")
@@ -30,17 +31,25 @@ function startupRecorder() {
 startupRecorder.prototype = {
   classID: Components.ID("{11c095b2-e42e-4bdf-9dd0-aed87595f6a4}"),
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
   record(name) {
     this.data[name] = {
       components: this.loader.loadedComponents(),
-      modules: this.loader.loadedModules()
+      modules: this.loader.loadedModules(),
+      services: Object.keys(Cc).filter(c => {
+        try {
+          Cm.isServiceInstantiatedByContractID(c, Ci.nsISupports);
+          return true;
+        } catch (e) {
+          return false;
+        }
+      })
     };
   },
 
   observe(subject, topic, data) {
 
     if (topic == "app-startup") {
       // We can't ensure our observer will be called first or last, so the list of
       // topics we observe here should avoid the topics used to trigger things
--- a/browser/locales/en-US/chrome/browser/accounts.properties
+++ b/browser/locales/en-US/chrome/browser/accounts.properties
@@ -30,19 +30,19 @@ syncStartNotification.title = Sync Enabl
 # %S is brandShortName
 syncStartNotification.body2 = %S will begin syncing momentarily.
 
 # LOCALIZATION NOTE (deviceDisconnectedNotification.title, deviceDisconnectedNotification.body)
 # These strings are used in a notification shown after Sync was disconnected remotely.
 deviceDisconnectedNotification.title = Sync disconnected
 deviceDisconnectedNotification.body = This computer has been successfully disconnected from Firefox Sync.
 
-# LOCALIZATION NOTE (sendTabToAllDevices.menuitem)
-# Displayed in the Send Tabs context menu when right clicking a tab, a page or a link.
-sendTabToAllDevices.menuitem = All Devices
+# LOCALIZATION NOTE (sendToAllDevices.menuitem)
+# Displayed in the Send Tab/Page/Link to Device context menu when right clicking a tab, a page or a link.
+sendToAllDevices.menuitem = Send to All Devices
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title,
 # tabsArrivingNotification.title, unnamedTabsArrivingNotification2.body,
 # unnamedTabsArrivingNotificationMultiple2.body, unnamedTabsArrivingNotificationNoDevice.body)
 # These strings are used in a notification shown when we're opening tab(s) another device sent us to display.
 
 # LOCALIZATION NOTE (tabArrivingNotification.title, tabArrivingNotificationWithDevice.title)
 # The body for these is the URL of the tab recieved
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -465,16 +465,21 @@ These should match what Safari and other
 <!ENTITY searchFocusUnix.commandkey   "j">
 
 <!-- LOCALIZATION NOTE (contentSearchInput.label):
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Search query">
 <!ENTITY contentSearchSubmit.tooltip  "Submit search">
 
+<!-- LOCALIZATION NOTE (searchInput.placeholder):
+     This string is displayed in the search box when the input field is empty. -->
+<!ENTITY searchInput.placeholder      "Search">
+<!ENTITY searchIcon.tooltip           "Search">
+
 <!-- LOCALIZATION NOTE (searchFor.label, searchWith.label):
      These two strings are used to build the header above the list of one-click
      search providers:  "Search for <used typed keywords> with:" -->
 <!ENTITY searchFor.label              "Search for ">
 <!ENTITY searchWith.label             " with:">
 
 <!-- LOCALIZATION NOTE (search.label, searchAfter.label):
      This string is used to build the header above the list of one-click search
deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/searchbar.dtd
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY cmd_engineManager.label        "Manage Search Engines…">
-<!ENTITY searchEndCap.label             "Search">
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -28,17 +28,16 @@
     locale/browser/newTab.dtd                      (%chrome/browser/newTab.dtd)
     locale/browser/newTab.properties               (%chrome/browser/newTab.properties)
     locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)
     locale/browser/pageInfo.properties             (%chrome/browser/pageInfo.properties)
     locale/browser/quitDialog.properties           (%chrome/browser/quitDialog.properties)
     locale/browser/safeMode.dtd                    (%chrome/browser/safeMode.dtd)
     locale/browser/sanitize.dtd                    (%chrome/browser/sanitize.dtd)
     locale/browser/search.properties               (%chrome/browser/search.properties)
-    locale/browser/searchbar.dtd                   (%chrome/browser/searchbar.dtd)
     locale/browser/sitePermissions.properties      (%chrome/browser/sitePermissions.properties)
     locale/browser/engineManager.properties        (%chrome/browser/engineManager.properties)
     locale/browser/setDesktopBackground.dtd        (%chrome/browser/setDesktopBackground.dtd)
     locale/browser/shellservice.properties         (%chrome/browser/shellservice.properties)
     locale/browser/tabbrowser.properties           (%chrome/browser/tabbrowser.properties)
     locale/browser/taskbar.properties              (%chrome/browser/taskbar.properties)
     locale/browser/translation.dtd                 (%chrome/browser/translation.dtd)
     locale/browser/translation.properties          (%chrome/browser/translation.properties)
--- a/browser/modules/ContentSearch.jsm
+++ b/browser/modules/ContentSearch.jsm
@@ -114,17 +114,17 @@ this.ContentSearch = {
   },
 
   get searchSuggestionUIStrings() {
     if (this._searchSuggestionUIStrings) {
       return this._searchSuggestionUIStrings;
     }
     this._searchSuggestionUIStrings = {};
     let searchBundle = Services.strings.createBundle("chrome://browser/locale/search.properties");
-    let stringNames = ["searchHeader", "searchPlaceholder", "searchForSomethingWith",
+    let stringNames = ["searchHeader", "searchForSomethingWith",
                        "searchWithHeader", "searchSettings"];
 
     for (let name of stringNames) {
       this._searchSuggestionUIStrings[name] = searchBundle.GetStringFromName(name);
     }
     return this._searchSuggestionUIStrings;
   },
 
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -6,16 +6,19 @@
 
 include('gyp_base.mozbuild')
 
 gyp_vars.update({
     'lsan': 0,
     'asan': 0,
     'build_with_mozilla': 1,
     'build_with_chromium': 0,
+    # 10.9 once we move to TC cross-compiles - bug 1270217
+    'mac_sdk_min': '10.7',
+    'mac_deployment_target': '10.7',
     'use_official_google_api_keys': 0,
     'have_clock_monotonic': 1 if CONFIG['HAVE_CLOCK_MONOTONIC'] else 0,
     'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
     'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
     'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
     # basic stuff for everything
     'include_internal_video_render': 0,
     'clang': 1 if CONFIG['CLANG_CXX'] else 0,
@@ -26,24 +29,28 @@ gyp_vars.update({
     'enable_android_opensl_output': 0,
     # use_system_lib* still seems to be in use in trunk/build
     'use_system_libjpeg': 0,
     'use_system_libvpx': 0,
     'build_json': 0,
     'build_libjpeg': 0,
     'build_libyuv': 0,
     'build_libvpx': 0,
+    'build_libevent': 0,
     'build_ssl': 0,
     'build_json': 0,
     'build_icu': 0,
     'build_opus': 0,
     'libyuv_dir': '/media/libyuv/libyuv',
+    'libevent_dir': '/ipc/chromium/src/third_party/libevent',
     'yuv_disable_avx2': 0 if CONFIG['HAVE_X86_AVX2'] else 1,
     # don't use openssl
     'use_openssl': 0,
+    # Must match build/gyp.mozbuild WEBRTC_BUILD_LIBEVENT
+    #'enable_libevent': 0, default according to OS
 
     'debug': 1 if CONFIG['DEBUG'] else 0,
 
     'use_x11': 1 if CONFIG['MOZ_X11'] else 0,
     'use_glib': 1 if CONFIG['GLIB_LIBS'] else 0,
 
      # turn off mandatory use of NEON and instead use NEON detection
     'arm_neon': 0,
@@ -69,31 +76,35 @@ gyp_vars.update({
     'include_g711': 1,
     'include_opus': 1,
     'include_g722': 1,
     'include_ilbc': 0,
     # We turn on ISAC because the AGC uses parts of it, and depend on the
     # linker to throw away uneeded bits.
     'include_isac': 1,
     'include_pcm16b': 1,
+
+    #'rtc_opus_variable_complexity': 1,
 })
 
 if os == 'Android':
     gyp_vars.update(
         gtest_target_type='executable',
         moz_webrtc_mediacodec=1,
         android_toolchain=CONFIG.get('ANDROID_TOOLCHAIN', ''),
     )
 
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:
         gyp_vars['armv7'] = 0
         gyp_vars['arm_neon_optional'] = 0
     elif os == 'Android':
         gyp_vars['armv7'] = 1
+        gyp_vars['arm_neon'] = 1
+        gyp_vars['build_with_neon'] = 1
     else:
         # CPU detection for ARM works on Android only.  armv7 always uses CPU
         # detection, so we have to set armv7=0 for non-Android target
         gyp_vars['armv7'] = 0
     # For libyuv
     gyp_vars['arm_version'] = int(CONFIG['ARM_ARCH'])
 
 # Don't try to compile ssse3/sse4.1 code if toolchain doesn't support
--- a/build/mozconfig.rust
+++ b/build/mozconfig.rust
@@ -1,7 +1,9 @@
 # Options to enable rust in automation builds.
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 # Tell configure to use the tooltool rustc.
 RUSTC="$TOOLTOOL_DIR/rustc/bin/rustc"
 CARGO="$TOOLTOOL_DIR/rustc/bin/cargo"
+
+ac_add_options --enable-rust-simd
--- a/caps/nsScriptSecurityManager.cpp
+++ b/caps/nsScriptSecurityManager.cpp
@@ -58,16 +58,18 @@
 #include "mozilla/dom/BindingUtils.h"
 #include <stdint.h>
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
 #include "nsContentUtils.h"
 #include "nsJSUtils.h"
 #include "nsILoadInfo.h"
+#include "nsIDOMXULCommandDispatcher.h"
+#include "nsITreeSelection.h"
 
 // This should be probably defined on some other place... but I couldn't find it
 #define WEBAPPS_PERM_NAME "webapps-manage"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 nsIIOService    *nsScriptSecurityManager::sIOService = nullptr;
@@ -1203,26 +1205,41 @@ nsScriptSecurityManager::CanCreateWrappe
 // XXX Special case for nsIXPCException ?
     ClassInfoData objClassInfo = ClassInfoData(aClassInfo, nullptr);
     if (objClassInfo.IsDOMClass())
     {
         return NS_OK;
     }
 
     // We give remote-XUL whitelisted domains a free pass here. See bug 932906.
-    if (!xpc::AllowContentXBLScope(js::GetContextCompartment(cx)))
+    JSCompartment* contextCompartment = js::GetContextCompartment(cx);
+    if (!xpc::AllowContentXBLScope(contextCompartment))
     {
         return NS_OK;
     }
 
     if (nsContentUtils::IsCallerChrome())
     {
         return NS_OK;
     }
 
+    // We want to expose nsIDOMXULCommandDispatcher and nsITreeSelection implementations
+    // in XBL scopes.
+    if (xpc::IsContentXBLScope(contextCompartment)) {
+      nsCOMPtr<nsIDOMXULCommandDispatcher> dispatcher = do_QueryInterface(aObj);
+      if (dispatcher) {
+        return NS_OK;
+      }
+
+      nsCOMPtr<nsITreeSelection> treeSelection = do_QueryInterface(aObj);
+      if (treeSelection) {
+        return NS_OK;
+      }
+    }
+
     //-- Access denied, report an error
     NS_ConvertUTF8toUTF16 strName("CreateWrapperDenied");
     nsAutoCString origin;
     nsIPrincipal* subjectPrincipal = nsContentUtils::SubjectPrincipal();
     GetPrincipalDomainOrigin(subjectPrincipal, origin);
     NS_ConvertUTF8toUTF16 originUnicode(origin);
     NS_ConvertUTF8toUTF16 classInfoName(objClassInfo.GetName());
     const char16_t* formatStrings[] = {
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -958,25 +958,30 @@ ifdef MOZ_MSVCBITS
 environment_cleaner = PATH='' LIB='' LIBPATH=''
 # The servo build needs to know where python is, and we're removing the PATH
 # so we tell it explicitly via the PYTHON env var.
 environment_cleaner += PYTHON='$(shell which $(PYTHON))'
 else
 environment_cleaner =
 endif
 
+rust_unlock_unstable =
+ifdef MOZ_RUST_SIMD
+rust_unlock_unstable += RUSTC_BOOTSTRAP=1
+endif
+
 # This function is intended to be called by:
 #
 #   $(call CARGO_BUILD,EXTRA_ENV_VAR1=X EXTRA_ENV_VAR2=Y ...)
 #
 # but, given the idiosyncracies of make, can also be called without arguments:
 #
 #   $(call CARGO_BUILD)
 define CARGO_BUILD
-env $(environment_cleaner) $(rustflags_override) \
+env $(environment_cleaner) $(rust_unlock_unstable) $(rustflags_override) \
 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
 	RUSTC=$(RUSTC) \
 	MOZ_SRC=$(topsrcdir) \
 	MOZ_DIST=$(ABS_DIST) \
 	LIBCLANG_PATH="$(MOZ_LIBCLANG_PATH)" \
 	CLANG_PATH="$(MOZ_CLANG_PATH)" \
 	PKG_CONFIG_ALLOW_CROSS=1 \
 	RUST_BACKTRACE=1 \
--- a/devtools/client/jsonview/.eslintrc.js
+++ b/devtools/client/jsonview/.eslintrc.js
@@ -1,11 +1,11 @@
 "use strict";
 
 module.exports = {
   "globals": {
     "define": true,
     "document": true,
     "window": true,
     "CustomEvent": true,
-    "Locale": true
+    "JSONView": true
   }
 };
--- a/devtools/client/jsonview/components/headers-panel.js
+++ b/devtools/client/jsonview/components/headers-panel.js
@@ -64,17 +64,17 @@ define(function (require, exports, modul
     onCopy: function (event) {
       this.props.actions.onCopyHeaders();
     },
 
     render: function () {
       return (
         Toolbar({},
           ToolbarButton({className: "btn copy", onClick: this.onCopy},
-            Locale.$STR("jsonViewer.Copy")
+            JSONView.Locale.$STR("jsonViewer.Copy")
           )
         )
       );
     },
   }));
 
   // Exports from this module
   exports.HeadersPanel = HeadersPanel;
--- a/devtools/client/jsonview/components/headers.js
+++ b/devtools/client/jsonview/components/headers.js
@@ -29,25 +29,25 @@ define(function (require, exports, modul
 
     render: function () {
       let data = this.props.data;
 
       return (
         div({className: "netInfoHeadersTable"},
           div({className: "netHeadersGroup"},
             div({className: "netInfoHeadersGroup"},
-              Locale.$STR("jsonViewer.responseHeaders")
+              JSONView.Locale.$STR("jsonViewer.responseHeaders")
             ),
             table({cellPadding: 0, cellSpacing: 0},
               HeaderList({headers: data.response})
             )
           ),
           div({className: "netHeadersGroup"},
             div({className: "netInfoHeadersGroup"},
-              Locale.$STR("jsonViewer.requestHeaders")
+              JSONView.Locale.$STR("jsonViewer.requestHeaders")
             ),
             table({cellPadding: 0, cellSpacing: 0},
               HeaderList({headers: data.request})
             )
           )
         )
       );
     }
--- a/devtools/client/jsonview/components/json-panel.js
+++ b/devtools/client/jsonview/components/json-panel.js
@@ -174,20 +174,20 @@ define(function (require, exports, modul
     onCopy: function (event) {
       this.props.actions.onCopyJson();
     },
 
     render: function () {
       return (
         Toolbar({},
           ToolbarButton({className: "btn save", onClick: this.onSave},
-            Locale.$STR("jsonViewer.Save")
+            JSONView.Locale.$STR("jsonViewer.Save")
           ),
           ToolbarButton({className: "btn copy", onClick: this.onCopy},
-            Locale.$STR("jsonViewer.Copy")
+            JSONView.Locale.$STR("jsonViewer.Copy")
           ),
           SearchBox({
             actions: this.props.actions
           })
         )
       );
     },
   }));
--- a/devtools/client/jsonview/components/main-tabbed-area.js
+++ b/devtools/client/jsonview/components/main-tabbed-area.js
@@ -50,35 +50,35 @@ define(function (require, exports, modul
 
     render: function () {
       return (
         Tabs({
           tabActive: this.state.tabActive,
           onAfterChange: this.onTabChanged},
           TabPanel({
             className: "json",
-            title: Locale.$STR("jsonViewer.tab.JSON")},
+            title: JSONView.Locale.$STR("jsonViewer.tab.JSON")},
             JsonPanel({
               data: this.props.json,
               jsonTextLength: this.props.jsonText.length,
               actions: this.props.actions,
               searchFilter: this.state.searchFilter
             })
           ),
           TabPanel({
             className: "rawdata",
-            title: Locale.$STR("jsonViewer.tab.RawData")},
+            title: JSONView.Locale.$STR("jsonViewer.tab.RawData")},
             TextPanel({
               data: this.state.jsonText,
               actions: this.props.actions
             })
           ),
           TabPanel({
             className: "headers",
-            title: Locale.$STR("jsonViewer.tab.Headers")},
+            title: JSONView.Locale.$STR("jsonViewer.tab.Headers")},
             HeadersPanel({
               data: this.props.headers,
               actions: this.props.actions,
               searchFilter: this.props.searchFilter
             })
           )
         )
       );
--- a/devtools/client/jsonview/components/search-box.js
+++ b/devtools/client/jsonview/components/search-box.js
@@ -39,17 +39,17 @@ define(function (require, exports, modul
 
     doSearch: function (searchBox) {
       this.props.actions.onSearch(searchBox.value);
     },
 
     render: function () {
       return (
         input({className: "searchBox devtools-filterinput",
-               placeholder: Locale.$STR("jsonViewer.filterJSON"),
+               placeholder: JSONView.Locale.$STR("jsonViewer.filterJSON"),
                onChange: this.onSearch})
       );
     },
   });
 
   // Exports from this module
   exports.SearchBox = SearchBox;
 });
--- a/devtools/client/jsonview/components/text-panel.js
+++ b/devtools/client/jsonview/components/text-panel.js
@@ -69,27 +69,27 @@ define(function (require, exports, modul
     },
 
     render: function () {
       return (
         Toolbar({},
           ToolbarButton({
             className: "btn save",
             onClick: this.onSave},
-            Locale.$STR("jsonViewer.Save")
+            JSONView.Locale.$STR("jsonViewer.Save")
           ),
           ToolbarButton({
             className: "btn copy",
             onClick: this.onCopy},
-            Locale.$STR("jsonViewer.Copy")
+            JSONView.Locale.$STR("jsonViewer.Copy")
           ),
           ToolbarButton({
             className: "btn prettyprint",
             onClick: this.onPrettify},
-            Locale.$STR("jsonViewer.PrettyPrint")
+            JSONView.Locale.$STR("jsonViewer.PrettyPrint")
           )
         )
       );
     },
   }));
 
   // Exports from this module
   exports.TextPanel = TextPanel;
--- a/devtools/client/jsonview/converter-child.js
+++ b/devtools/client/jsonview/converter-child.js
@@ -7,18 +7,20 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
 const { XPCOMUtils } = Cu.import("resource://gre/modules/XPCOMUtils.jsm", {});
 const Services = require("Services");
 
 loader.lazyRequireGetter(this, "NetworkHelper",
                                "devtools/shared/webconsole/network-helper");
-loader.lazyRequireGetter(this, "JsonViewUtils",
-                               "devtools/client/jsonview/utils");
+loader.lazyGetter(this, "debug", function () {
+  let {AppConstants} = require("resource://gre/modules/AppConstants.jsm");
+  return !!(AppConstants.DEBUG || AppConstants.DEBUG_JS_MODULES);
+});
 
 const childProcessMessageManager =
   Cc["@mozilla.org/childprocessmessagemanager;1"]
     .getService(Ci.nsISyncMessageSender);
 
 // Localization
 loader.lazyGetter(this, "jsonViewStrings", () => {
   return Services.strings.createBundle(
@@ -133,27 +135,33 @@ function fixSave(request) {
     originalType = JSON_TYPES[0];
   }
   request.QueryInterface(Ci.nsIWritablePropertyBag);
   request.setProperty("contentType", originalType);
 }
 
 // Exports variables that will be accessed by the non-privileged scripts.
 function exportData(win, request) {
+  let data = Cu.createObjectIn(win, {
+    defineAs: "JSONView"
+  });
+
+  data.debug = debug;
+
   let Locale = {
     $STR: key => {
       try {
         return jsonViewStrings.GetStringFromName(key);
       } catch (err) {
         console.error(err);
         return undefined;
       }
     }
   };
-  JsonViewUtils.exportIntoContentScope(win, Locale, "Locale");
+  data.Locale = Cu.cloneInto(Locale, win, {cloneFunctions: true});
 
   let headers = {
     response: [],
     request: []
   };
   // The request doesn't have to be always nsIHttpChannel
   // (e.g. in case of data: URLs)
   if (request instanceof Ci.nsIHttpChannel) {
@@ -163,17 +171,17 @@ function exportData(win, request) {