diff options
| author | pkanwar <pkanwar@google.com> | 2017-04-27 13:15:56 -0700 |
|---|---|---|
| committer | pkanwar <pkanwar@google.com> | 2017-04-27 13:16:18 -0700 |
| commit | 2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b (patch) | |
| tree | a25e28a53501a7406b20d3f8c072b0cc35e146fa /libril/Android.mk | |
| parent | ba70869b5373c12acdca8b056db47c44c85d0dce (diff) | |
| parent | ee186e90c170e3d98de905d42b8415466f6fa656 (diff) | |
| download | android_hardware_ril-2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b.tar.gz android_hardware_ril-2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b.tar.bz2 android_hardware_ril-2a6951e07f3e6fcf1ce5b4e87f4be9fb31d6694b.zip | |
resolve merge conflicts of ee186e9 to oc-dev-plus-aosp
Change-Id: I6f4b2606cc2f4e985a33f629e7861121b32a9952
Test: manual
Bug: 35606429
Diffstat (limited to 'libril/Android.mk')
| -rw-r--r-- | libril/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libril/Android.mk b/libril/Android.mk index 952e6be..705a1a0 100644 --- a/libril/Android.mk +++ b/libril/Android.mk @@ -19,6 +19,7 @@ LOCAL_SHARED_LIBRARIES := \ libhardware_legacy \ librilutils \ android.hardware.radio@1.0 \ + android.hardware.radio@1.1 \ android.hardware.radio.deprecated@1.0 \ libhidlbase \ libhidltransport \ |