commit 9545fed27597d09dcfa63f6d1259ed2fe8817fb7
author sqian <shuoq@google.com> Tue Nov 14 11:37:31 2017 -0800
committer Shuo Qian <shuoq@google.com> Tue Nov 14 22:29:29 2017 +0000
tree 42767a27f7b73d4994613950fb7f4f1be70ea2b4
parent 3200996d4b524c0b705bbd830229a773128de1de

Fix merge conflict CL

Test: Treehugger
Bug: 65230472
Change-Id: Ie131c9a4fa5b42c7779fca70ce2233b24e5f8825

current.txt

diff --git a/current.txt b/current.txt
index d4f20d3..0a2f090 100644
--- a/current.txt
+++ b/current.txt
@@ -196,6 +196,7 @@
 78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860
 e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse
 6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse
+c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O
 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
 df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types