diff options
| author | sqian | 2017-11-14 13:37:31 -0600 |
|---|---|---|
| committer | Shuo Qian | 2017-11-14 16:29:29 -0600 |
| commit | 9545fed27597d09dcfa63f6d1259ed2fe8817fb7 (patch) | |
| tree | 42767a27f7b73d4994613950fb7f4f1be70ea2b4 | |
| parent | 3200996d4b524c0b705bbd830229a773128de1de (diff) | |
| download | platform-hardware-interfaces-9545fed27597d09dcfa63f6d1259ed2fe8817fb7.tar.gz platform-hardware-interfaces-9545fed27597d09dcfa63f6d1259ed2fe8817fb7.tar.xz platform-hardware-interfaces-9545fed27597d09dcfa63f6d1259ed2fe8817fb7.zip | |
Fix merge conflict CL
Test: Treehugger
Bug: 65230472
Change-Id: Ie131c9a4fa5b42c7779fca70ce2233b24e5f8825
| -rw-r--r-- | current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/current.txt b/current.txt index d4f20d3b..0a2f0903 100644 --- a/current.txt +++ b/current.txt | |||
| @@ -196,6 +196,7 @@ dc7e6d4f537b9943e27edc4f86c5a03bb643b18f18f866f8c3c71c0ac4ea8cbc android.hardwar | |||
| 196 | 78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860 | 196 | 78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860 |
| 197 | e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse | 197 | e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse |
| 198 | 6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse | 198 | 6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse |
| 199 | c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O | ||
| 199 | 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types | 200 | 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types |
| 200 | df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types | 201 | df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types |
| 201 | 202 | ||