Commit 66231ca0 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge b2g-inbound to mozilla-central a=merge

parents 5955e06b eff56fac

b2g/config/dolphin/sources.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">

    <copyfile dest="Makefile" src="core/root.mk"/>

  </project>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb7414fa6f5dbb898adc5bd2bbd9fb75df0d0054"/>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="f37be8b44cb7c3a147b9615ab76743b760f08eeb"/>

  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>

  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>

  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
@@ -138,7 +138,7 @@ 
  <project name="platform/system/core" path="system/core" revision="a626f6c0ef9e88586569331bd7387b569eaa5ed2"/>

  <project name="u-boot" path="u-boot" revision="f1502910977ac88f43da7bf9277c3523ad4b0b2f"/>

  <project name="vendor/sprd/gps" path="vendor/sprd/gps" revision="4c59900937dc2e978b7b14b7f1ea617e3d5d550e"/>

  <project name="vendor/sprd/open-source" path="vendor/sprd/open-source" revision="c5206aa084ad36037b8ee4b405a71ec7bd88b41c"/>

  <project name="vendor/sprd/open-source" path="vendor/sprd/open-source" revision="e503b1d14d7fdee532b8f391407299da193c1b2d"/>

  <project name="vendor/sprd/partner" path="vendor/sprd/partner" revision="8649c7145972251af11b0639997edfecabfc7c2e"/>

  <project name="vendor/sprd/proprietories" path="vendor/sprd/proprietories" revision="d2466593022f7078aaaf69026adf3367c2adb7bb"/>

</manifest>

b2g/config/emulator-ics/sources.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <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="fb7414fa6f5dbb898adc5bd2bbd9fb75df0d0054"/>

  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="f37be8b44cb7c3a147b9615ab76743b760f08eeb"/>

  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>

  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>

  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="93f9ba577f68d772093987c2f1c0a4ae293e1802"/>

b2g/config/emulator-jb/sources.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
  </project>

  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>

  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb7414fa6f5dbb898adc5bd2bbd9fb75df0d0054"/>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="f37be8b44cb7c3a147b9615ab76743b760f08eeb"/>

  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>

  <project name="moztt" path="external/moztt" remote="b2g" revision="ed2cf97a6c37a4bbd0bbbbffe06ec7136d8c79ff"/>

  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="d99ab92d0b829a6c78b5284481d5b236d3901f11"/>

b2g/config/emulator-kk/sources.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  <project name="platform_build" path="build" remote="b2g" revision="ef937d1aca7c4cf89ecb5cc43ae8c21c2000a9db">

    <copyfile dest="Makefile" src="core/root.mk"/>

  </project>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb7414fa6f5dbb898adc5bd2bbd9fb75df0d0054"/>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="f37be8b44cb7c3a147b9615ab76743b760f08eeb"/>

  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>

  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>

  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

b2g/config/emulator-l/sources.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  <project name="platform_build" path="build" remote="b2g" revision="52775e03a2d8532429dff579cb2cd56718e488c3">

    <copyfile dest="Makefile" src="core/root.mk"/>

  </project>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="fb7414fa6f5dbb898adc5bd2bbd9fb75df0d0054"/>

  <project name="gaia" path="gaia" remote="mozillaorg" revision="f37be8b44cb7c3a147b9615ab76743b760f08eeb"/>

  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>

  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2aa4a75c63cd6e93870a8bddbba45f863cbfd9a3"/>

  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>