commit 68bd27a3976f8aeba43a9734ca0eaeafd5e6f2d9
author Nathan Harold <nharold@google.com> Fri Jan 10 16:07:10 2020 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 10 16:07:10 2020 -0800
tree 0f0601b3b7d2b79d2cf701408deef381463b0596
parent f3c5bf1cc85fe766db86ef9db3510710ea2f9a03
parent 1fd6b723df993482a589548ccabec88beda6b362

Add Some Buffer Lines to Avoid Merge Conflicts
am: 1fd6b723df

Change-Id: I8259a5012113d2c85d81be63249b50e214c02770

current.txt

diff --git a/current.txt b/current.txt
index ae41853..ab49dc4 100644
--- a/current.txt
+++ b/current.txt
@@ -628,6 +628,9 @@
 619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
 c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
 9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
+##
+# BEGIN Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present
+##
 2c0587a1e83facba604949c31163486f21eb5b47a29c8f29119a47d3bd052103 android.hardware.radio@1.5::types
 b5cfa87882b416105fe01e8a40a856d36c93d64f1103d77e12b1281cea13b0bd android.hardware.radio@1.5::IRadio
 bc59237dbd93949238081f762710552e76670cb648c0e198138551460ac54b1e android.hardware.radio@1.5::IRadioIndication
@@ -636,3 +639,6 @@
 b27ab0cd40b0b078cdcd024bfe1061c4c4c065f3519eeb9347fa359a3268a5ae android.hardware.radio.config@1.3::IRadioConfig
 742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication
 7683fed9d253956071f18b152e6be657719536f98d9b534433d5e411bcde5061 android.hardware.radio.config@1.3::IRadioConfigResponse
+##
+# END Radio HAL Merge Conflict Avoidance Buffer - STOPSHIP if present
+##