Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 27 Apr 2014 20:57:44 -0400
changeset 198994 84ba8cd9ab6740304bb04818e787ec5b108590e7
parent 198993 bc6a9d65b84ff312bd9b35b9d9b66e4a8ac6c4fb (current diff)
parent 198977 622a6f10eefbcdb123e1557353d209da7da2c109 (diff)
child 198995 4d926af899078ecea0e54142f5a8a1b2d2b591ce
child 198996 61b91c85a7aacda7fa9d1583188854bc4b187d53
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
mobile/android/base/tests/roboextender/testSelectionHandler.html
mobile/android/base/tests/testSelectionHandler.java
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -14,17 +14,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0292e64ef8451df104dcf9ac3b2c6749b81684dd"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="85f9690323b235f4dcf2901ea2240d3c60fc22a0"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="e6383e6e785cc3ea237e902beb1092f9aa88e29d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="65fba428f8d76336b33ddd9e15900357953600ba">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <!-- Stock Android things -->
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -14,17 +14,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0292e64ef8451df104dcf9ac3b2c6749b81684dd"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="85f9690323b235f4dcf2901ea2240d3c60fc22a0"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -13,17 +13,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="e6383e6e785cc3ea237e902beb1092f9aa88e29d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="e95b4ce22c825da44d14299e1190ea39a5260bde"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="471afab478649078ad7c75ec6b252481a59e19b8"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
         "git_revision": "", 
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "949df3be29b432b53a4ee232e7fd19881b5aca6b", 
+    "revision": "16672d155555bc730d998621efe34f2b5bbd66b7", 
     "repo_path": "/integration/gaia-central"
 }
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -14,17 +14,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="e6383e6e785cc3ea237e902beb1092f9aa88e29d">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="265e1ac4ee71ad6190335c974bfce33f783edfce"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f50d8a3504e0a57d371457c50a6ced333e20724d"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -3,17 +3,17 @@ support-files =
   head.js
   constraints.js
   mediaStreamPlayback.js
   pc.js
   templates.js
   NetworkPreparationChromeScript.js
 
 [test_dataChannel_basicAudio.html]
-skip-if = (toolkit == 'gonk' && debug) #Bug 962984, test fail on b2g debug build
+skip-if = toolkit == 'gonk' #Bug 962984 for debug, bug 963244 for opt
 [test_dataChannel_basicAudioVideo.html]
 # Disabled on OS X for bug 930481 timeouts
 skip-if = os == 'mac' || toolkit=='gonk' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) b2g-debug(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_dataChannel_basicAudioVideoCombined.html]
 # Disabled on OS X for bug 930481 timeouts
 skip-if = os == 'mac' || toolkit=='gonk' # b2g(Bug 960442, video support for WebRTC is disabled on b2g) b2g-debug(Bug 960442, video support for WebRTC is disabled on b2g)
 [test_dataChannel_basicDataOnly.html]
 [test_dataChannel_basicVideo.html]
--- a/mobile/android/base/EventDispatcher.java
+++ b/mobile/android/base/EventDispatcher.java
@@ -1,17 +1,16 @@
 /* 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/. */
 
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
-import org.mozilla.gecko.mozglue.RobocopTarget;
 import org.mozilla.gecko.util.EventCallback;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.NativeEventListener;
 import org.mozilla.gecko.util.NativeJSContainer;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -204,17 +203,16 @@ public final class EventDispatcher {
             for (final GeckoEventListener listener : listeners) {
                 listener.handleMessage(type, message);
             }
         } catch (final JSONException e) {
             Log.e(LOGTAG, "handleGeckoMessage throws " + e, e);
         }
     }
 
-    @RobocopTarget
     @Deprecated
     public static void sendResponse(JSONObject message, Object response) {
         sendResponseHelper(STATUS_SUCCESS, message, response);
     }
 
     @Deprecated
     public static void sendError(JSONObject message, Object response) {
         sendResponseHelper(STATUS_ERROR, message, response);
--- a/mobile/android/base/tests/StringHelper.java
+++ b/mobile/android/base/tests/StringHelper.java
@@ -87,17 +87,16 @@ public class StringHelper {
     public static final String ROBOCOP_BOXES_TITLE = "Browser Box test";
     public static final String ROBOCOP_GEOLOCATION_TITLE = "Geolocation Test Page";
     public static final String ROBOCOP_LOGIN_TITLE = "Robocop Login";
     public static final String ROBOCOP_OFFLINE_STORAGE_TITLE = "Robocop offline storage";
     public static final String ROBOCOP_PICTURE_LINK_TITLE = "Picture Link";
     public static final String ROBOCOP_SEARCH_TITLE = "Robocop Search Engine";
     public static final String ROBOCOP_TEXT_PAGE_TITLE = "Robocop Text Page";
     public static final String ROBOCOP_INPUT_TITLE = "Robocop Input";
-    public static final String ROBOCOP_SELECTION_HANDLER_TITLE = "Automated Text Selection tests for Mobile";
 
     // Settings menu strings
     // Section labels - ordered as found in the settings menu
     public static final String CUSTOMIZE_SECTION_LABEL = "Customize";
     public static final String DISPLAY_SECTION_LABEL = "Display";
     public static final String PRIVACY_SECTION_LABEL = "Privacy";
     public static final String MOZILLA_SECTION_LABEL = "Mozilla";
     public static final String DEVELOPER_TOOLS_SECTION_LABEL = "Developer tools";
--- a/mobile/android/base/tests/robocop.ini
+++ b/mobile/android/base/tests/robocop.ini
@@ -76,17 +76,16 @@ skip-if = processor == "x86"
 [testPasswordProvider]
 # [testPermissions] # see bug 757475
 [testPictureLinkContextMenu]
 # disabled on 2.3; bug 986164
 skip-if = android_version == "10"
 [testPrefsObserver]
 [testPrivateBrowsing]
 [testPromptGridInput]
-[testSelectionHandler]
 # disabled on x86 only; bug 957185
 skip-if = processor == "x86"
 # [testReaderMode] # see bug 913254, 936224
 [testReadingListProvider]
 [testSearchSuggestions]
 # disabled on x86 and 2.3; bug 907768, 979548
 skip-if = android_version == "10" || processor == "x86"
 [testSessionOOMSave]
deleted file mode 100644
--- a/mobile/android/base/tests/roboextender/testSelectionHandler.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<html>
-  <head>
-    <title>Automated Text Selection tests for Mobile</title>
-    <meta name="viewport" content="initial-scale=1.0"/>
-    <script type="application/javascript"
-      src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
-    <script type="application/javascript">
-
-const DIV_POINT_TEXT = "Under";
-const INPUT_TEXT = "Text for select all in an <input>";
-const TEXTAREA_TEXT = "Text for select all in a <textarea>";
-
-const { classes: Cc, interfaces: Ci, results: Cr, utils: Cu } = Components;
-Cu.import("resource://gre/modules/Messaging.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-/* =================================================================================
- *
- * Start of all text selection tests, check initialization state.
- *
- */
-function startTests() {
-  testSelectAllDivs().
-    then(testSelectDivAtPoint).
-    then(testSelectInput).
-    then(testSelectTextarea).
-    then(testCloseSelection).
-    then(finishTests, function(err) {
-      ok(false, "Error in selection test " + err);
-      finishTests();
-    });
-}
-
-/* =================================================================================
- *
- * "Select all" text selection tests, for <div> (non-editable) fields.
- *
- */
-function testSelectAllDivs() {
-  var sh = getSelectionHandler();
-  var selDiv = document.getElementById("selDiv");
-  var nonSelDiv = document.getElementById("nonSelDiv");
-
-  // Check the initial state of the selection handler, and selectable/non-selectable <div>s.
-  return Promise.all([
-    ok(!sh.isSelectionActive(), "Selection should not be active at start of testSelectAllDivs"),
-    ok(sh.canSelect(selDiv), "Can select selectable <div>"),
-    ok(!sh.canSelect(nonSelDiv), "Can't select non-selectable <div>"),
-
-  ]).then(function() {
-    // Select all on a non-editable text node selects all the text in the page.
-    sh.startSelection(selDiv);
-    var selection = sh._getSelection();
-
-    return Promise.all([
-      ok(sh.isSelectionActive(), "Selection should be active now"),
-      is(selection.anchorNode, document.documentElement, "Anchor Node should be start of document"),
-      is(selection.anchorOffset, 0, "Anchor offset should be 0"),
-      is(selection.focusNode, document.body.lastChild, "Focus node should be lastChild of document"),
-      is(selection.focusOffset, document.body.lastChild.textContent.length, "Focus offset should be it's length"),
-    ]);
-  });
-}
-
-/* =================================================================================
- *
- * "Select word-at-point" text selection test, for <div> (non-editable) field.
- * "collapseToStart" test closes selection (Bug 864589).
- *
- */
-function testSelectDivAtPoint() {
-  var sh = getSelectionHandler();
-  var selDiv = document.getElementById("selDiv");
-
-  // Select word at point in <div>
-  var rect = selDiv.getBoundingClientRect();
-  sh.startSelection(selDiv, {
-    mode: sh.SELECT_AT_POINT,
-    x: rect.left + 1,
-    y: rect.top + 1
-  });
-  var selection = sh._getSelection();
-
-  // Check the state of the selection handler after selecting at a point.
-  return Promise.all([
-    ok(sh.isSelectionActive(), "Selection should be active at start of testSelectDivAtPoint"),
-    is(selection.toString(), DIV_POINT_TEXT, "The first word in the <div> was selected"),
-
-  ]).then(function() {
-    // Check the state of the selection handler after collapsing a selection.
-    selection.collapseToStart();
-
-    return Promise.all([
-      ok(selection.getRangeAt(0).collapsed, "Selection should be collapsed"),
-      ok(!sh.isSelectionActive(), "Selection should not be active"),
-    ]);
-  });
-}
-
-/* =================================================================================
- *
- * "Select all" text selection test, for <input> (editable) field.
- *
- */
-function testSelectInput() {
-  var sh = getSelectionHandler();
-  var inputNode = document.getElementById("inputNode");
-  inputNode.value = INPUT_TEXT;
-
-  // Test that calling startSelection with an input selects all the text in the input.
-  return Promise.all([
-    ok(!sh.isSelectionActive(), "Selection should not be active at start of testSelectInput"),
-    ok(sh.canSelect(inputNode), "Can select selectable <input>"),
-
-  ]).then(function() {
-    // Check the state of the selection handler after calling startSelection on it.
-    sh.startSelection(inputNode);
-    var selection = sh._getSelection();
-
-    return Promise.all([
-      ok(sh.isSelectionActive(), "Selection should be active"),
-      ok((sh._targetElement instanceof Ci.nsIDOMNSEditableElement), "Selected element is editable"),
-      is(selection.toString(), INPUT_TEXT, "All text in the <input> was selected"),
-    ]);
-  });
-}
-
-/* =================================================================================
- *
- * "Select all" text selection test, for <textarea> (editable) field.
- *
- */
-
-function testSelectTextarea() {
-  var sh = getSelectionHandler();
-  var textareaNode = document.getElementById("textareaNode");
-  textareaNode.value = TEXTAREA_TEXT;
-
-  // Change (still-active) selection from previous <input> field to <textarea>
-  sh.startSelection(textareaNode);
-  var selection = sh._getSelection();
-
-  return Promise.all([
-    ok(sh.isSelectionActive(), "Selection should be active at start of testSelectTextarea"),
-    ok((sh._targetElement instanceof Ci.nsIDOMHTMLTextAreaElement), "Selected element is editable, and a <textarea>"),
-    is(selection.toString(), TEXTAREA_TEXT, "All text in the <textarea> was selected"),
-
-  ]).then(function() {
-    // Collpase the selection to close it again.
-    selection.collapseToStart();
-
-    return Promise.all([
-      ok(!sh.isSelectionActive(), "Selection should not be active"),
-    ]);
-  });
-}
-
-/* =================================================================================
- *
- * Various text selection tests to end active selections, including:
- *   1.) Clicking outside the selection.
- *   2.) SelectionEnd or Tab:Selected messages from java.
- *
- */
-function testCloseSelection() {
-  var sh = getSelectionHandler();
-  var inputNode = document.getElementById("inputNode");
-  inputNode.value = INPUT_TEXT;
-
-  // Check the initial state of the selection handler.
-  return Promise.all([
-    ok(!sh.isSelectionActive(), "Selection should not be active at start of testCloseSelection"),
-
-  ]).then(function() {
-    // Start by selecting all in an <input>.
-    sh.startSelection(inputNode);
-    return is(sh._activeType, sh.TYPE_SELECTION, "Selection should be active in <input> before Gesture:SingleTap");
-
-  }).then(function() {
-    // Tap outside <input> to close active selection.
-    sh.observe(null, "Gesture:SingleTap", JSON.stringify({
-      x: 1,
-      y: 1
-    }));
-    return ok(!sh.isSelectionActive(), "Gesture:SingleTap outside <input> should close active selection");
-
-  // Various other ways to close an active selection.
-  }).then(function() {
-    sh.startSelection(inputNode);
-    sh.observe(null, "TextSelection:End", {});
-    return ok(!sh.isSelectionActive(), "TextSelection:End should close active selection");
-
-  }).then(function() {
-    sh.startSelection(inputNode);
-    sh.observe(null, "Tab:Selected", {});
-    return ok(!sh.isSelectionActive(), "Tab:Selected should close active selection");
-
-  }).then(function() {
-    sh.startSelection(inputNode);
-    sh.handleEvent({ type: "pagehide" });
-    return ok(!sh.isSelectionActive(), "pagehide should close active selection");
-
-  }).then(function() {
-    sh.startSelection(inputNode);
-    sh.handleEvent({ type: "blur" });
-    return ok(!sh.isSelectionActive(), "blur should close active selection");
-  });
-}
-
-/* =================================================================================
- *
- * After finish of all selection tests, wrap up and go home.
- *
- */
-function finishTests() {
-  sendMessageToJava({
-    type: "Robocop:testSelectionHandler",
-    result: true,
-    msg: "Done!",
-    done: true
-  });
-}
-
-/* ============================== Utility functions ======================
- *
- * Common functions available to all tests.
- *
- */
-function getSelectionHandler() {
-  return (!this._selectionHandler) ?
-    this._selectionHandler = Services.wm.getMostRecentWindow("navigator:browser").SelectionHandler :
-    this._selectionHandler;
-}
-
-function ok(one, msg) {
-  return new Promise(function(resolve, reject) {
-    sendMessageToJava({
-      type: "Robocop:testSelectionHandler",
-      result: one,
-      msg: msg
-    },
-    function (res, err) {
-      (err) ? reject(err) : resolve(res);
-    });
-  });
-}
-
-function is(one, two, msg) {
-  return new Promise(function(resolve, reject) {
-    sendMessageToJava({
-      type: "Robocop:testSelectionHandler",
-      result: one === two,
-      msg: msg + " : " + one + " === " + two
-    },
-    function (res, err) {
-      (err) ? reject(err) : resolve(res);
-    });
-  });
-}
-
-/* =================================================================================
- *
- * Page definition for all tests.
- *
- */
-    </script>
-  </head>
-
-  <body onload="startTests();">
-
-    <div id="selDiv">Under sufficiently extreme conditions, quarks may become
-      deconfined and exist as free particles. In the course of asymptotic freedom,
-      the strong interaction becomes weaker at higher temperatures. Eventually,
-      color confinement would be lost and an extremely hot plasma of freely moving
-      quarks and gluons would be formed. This theoretical phase of matter is called
-      quark-gluon plasma.[81] The exact conditions needed to give rise to this state
-      are unknown and have been the subject of a great deal of speculation and
-      experimentation. A recent estimate puts the needed temperature at
-      (1.90±0.02)×1012 Kelvin. While a state of entirely free quarks and gluons has
-      never been achieved (despite numerous attempts by CERN in the 1980s and 1990s),
-      recent experiments at the Relativistic Heavy Ion Collider have yielded evidence
-      for liquid-like quark matter exhibiting "nearly perfect" fluid motion.</div><br>
-
-    <div id="nonSelDiv" style="-moz-user-select: none;">Lorem ipsum dolor sit amet,
-      consectetur adipiscing elit. Proin in blandit magna, non porttitor augue.
-      Nam in neque sagittis, varius augue at, ornare velit. Vestibulum eget nisl
-      congue odio molestie scelerisque. Pellentesque ut augue orci. In hac habitasse
-      platea dictumst. Sed placerat tellus quis lacus condimentum, quis luctus elit
-      pellentesque. Mauris cursus neque diam, sit amet gravida quam porta ac.
-      Aliquam aliquam feugiat vestibulum. Proin commodo nulla ligula, in bibendum
-      massa euismod a. Ut ac lobortis dui. Ut id augue id arcu ornare suscipit eu
-      ornare lorem. Pellentesque nec dictum ante. Nam quis ligula ultricies, auctor
-      nunc vel, fringilla turpis. Nulla lacinia, leo ut egestas hendrerit, risus
-      ligula interdum enim, vel varius libero sem ut ligula.</div><br>
-
-    <input id="inputNode" type="text"><br>
-
-    <textarea id="textareaNode"></textarea><br>
-
-  </body>
-</html>
deleted file mode 100644
--- a/mobile/android/base/tests/testSelectionHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.mozilla.gecko.tests;
-
-import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.EventDispatcher;
-import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.NavigationHelper;
-
-import android.util.Log;
-
-import org.json.JSONObject;
-
-
-public class testSelectionHandler extends UITest {
-
-    public void testSelectionHandler() {
-        GeckoHelper.blockForReady();
-
-        Actions.EventExpecter robocopTestExpecter = getActions().expectGeckoEvent("Robocop:testSelectionHandler");
-        NavigationHelper.enterAndLoadUrl("chrome://roboextender/content/testSelectionHandler.html");
-        mToolbar.assertTitle(StringHelper.ROBOCOP_SELECTION_HANDLER_TITLE);
-
-        while (!test(robocopTestExpecter)) {
-            // do nothing
-        }
-
-        robocopTestExpecter.unregisterListener();
-    }
-
-    private boolean test(Actions.EventExpecter expecter) {
-        final JSONObject eventData;
-        try {
-            eventData = new JSONObject(expecter.blockForEventData());
-        } catch(Exception ex) {
-            // Log and ignore
-            getAsserter().ok(false, "JS Test", "Error decoding data " + ex);
-            return false;
-        }
-
-        if (eventData.has("result")) {
-            getAsserter().ok(eventData.optBoolean("result"), "JS Test", eventData.optString("msg"));
-        }
-
-        EventDispatcher.sendResponse(eventData, new JSONObject());
-        return eventData.optBoolean("done", false);
-    }
-}
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -2927,18 +2927,18 @@ UpdateService.prototype = {
   },
 
   // AddonUpdateListener
   onCompatibilityUpdateAvailable: function(addon) {
     // Remove the add-on from the list of add-ons that will become incompatible
     // with the new version of the application.
     for (var i = 0; i < this._incompatibleAddons.length; ++i) {
       if (this._incompatibleAddons[i].id == addon.id) {
-        LOG("UpdateService:onAddonUpdateEnded - found update for add-on ID: " +
-            addon.id);
+        LOG("UpdateService:onCompatibilityUpdateAvailable - found update for " +
+            "add-on ID: " + addon.id);
         this._incompatibleAddons.splice(i, 1);
       }
     }
   },
 
   onUpdateAvailable: function(addon, install) {
     if (getPref("getIntPref", PREF_APP_UPDATE_INCOMPATIBLE_MODE, 0) == 1)
       return;
@@ -3179,17 +3179,16 @@ UpdateService.prototype = {
                                     interfaces: [Ci.nsIApplicationUpdateService,
                                                  Ci.nsITimerCallback,
                                                  Ci.nsIObserver],
                                     flags: Ci.nsIClassInfo.SINGLETON}),
 
   _xpcom_factory: UpdateServiceFactory,
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIApplicationUpdateService,
                                          Ci.nsIUpdateCheckListener,
-                                         Ci.nsIAddonUpdateCheckListener,
                                          Ci.nsITimerCallback,
                                          Ci.nsIObserver])
 };
 
 /**
  * A service to manage active and past updates.
  * @constructor
  */