WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.

scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Android_Tests__dbg___JB_Nexus7_2_.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "[BUILD]/scripts/slave/bot_update.py",
       "--master",
       "chromium.webrtc.fyi",
       "--builder",
       "Android Tests (dbg) (JB Nexus7.2)",
       "--slave",
       "TestSlavename",
       "--spec",
       "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]\ntarget_os = ['android']",
       "--revision_mapping_file",
+<<<<<<< HEAD
       "{\"src\": \"got_chromium_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/libjingle/source/talk\": \"got_libjingle_revision\", \"src/third_party/libvpx/source\": \"got_libvpx_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+=======
+      "{\"src\": \"got_chromium_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
       "src@HEAD",
       "--revision",
       "src/third_party/libjingle/source/talk@HEAD",
       "--revision",
       "src/third_party/webrtc@HEAD",
       "--force"
     ],
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision\": 170242, @@@",
+<<<<<<< HEAD
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libjingle_revision\": 134440, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libjingle_revision_cp\": \"refs/heads/master@{#134440}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libjingle_revision_git\": \"8e938c8836c7ed23d7fbcddf1dcc2abcb13667d7\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision\": 11245, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision_cp\": \"refs/heads/master@{#11245}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision_git\": \"9240a98dab275a8a92a3631502866a58dceb2a49\", @@@",
+=======
+      "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": 274981, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_revision\": 120644, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_revision_cp\": \"refs/heads/master@{#120644}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision\": 276089, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision\": 43426, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webkit_revision\": 124383, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webkit_revision_cp\": \"refs/heads/master@{#124383}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
+<<<<<<< HEAD
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
       "@@@SET_BUILD_PROPERTY@got_revision@120644@@@",
+=======
+      "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
+      "@@@SET_BUILD_PROPERTY@got_chromium_revision_git@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@120644@@@",
+      "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
+      "@@@SET_BUILD_PROPERTY@got_chromium_revision@170242@@@",
+      "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
+      "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
       "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
       "@@@SET_BUILD_PROPERTY@got_libvpx_revision@11245@@@",
       "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#120644}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
       "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
       "@@@SET_BUILD_PROPERTY@got_libvpx_revision_git@\"9240a98dab275a8a92a3631502866a58dceb2a49\"@@@",
       "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
       "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
@@ skipping 187 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   }
 ]