commit 2825f3471e7d2764c226e30362f122abe8f6d480
author sqian <shuoq@google.com> Thu Nov 16 22:24:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 16 22:24:10 2017 +0000
tree afd903e5619c150eaf07c1eb4a9c68aa1b29b002
parent 3906f455cdeb512e14df7b80586c4c2c221b0949
parent ecc213b1246b2af1f7ff13598652e5bd82a33a07

Fix merge conflict CL for o-dr hashing am: 297522bd65
am: ecc213b124

Change-Id: I98670e70640eb449275fe0a8f6e285578e9365ce

current.txt

diff --git a/current.txt b/current.txt
index 6d49d26..67d5ee0 100644
--- a/current.txt
+++ b/current.txt
@@ -197,6 +197,7 @@
 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
+4922dd58e89a03181ed1c48a6e118e47633b73b11090bdfed5aa920d25a7592b android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O DR
 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
 bfd81bcafa3c97519cd56ad29e9fa48e23d1d323b89dbcc85899282a8c628194 android.hardware.automotive.vehicle@2.0::types
 df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types