tree 0086107950f198daad36535b10d6e24d151264f8
parent 519b185b2829965fbb0cfb72e5f38b31bb719937
parent 91bc7be71258dfd87d308f414c4f92b1c5efeaca
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576809441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576809441 +0000

[automerger skipped] Merge "Use sysprop library for telephony props" am: afb16fa9d4 am: dc4de88fec am: 91bc7be712 -s ours
am skip reason: Change-Id Idefa10b5bdeaff69496bc66730a7398258f3a38e with SHA-1 1b5e241b92 is in history

Change-Id: I521192cb7014dc8f908c50c7ca8d67daf561c800