tree b935050521dbf0f0ba4e5601d372418311856323
parent 65c4c0a5c8ce2634e931252e90cf79c5357fdf1e
parent 30a1066c7a6c4fd406be77f5280c343154cf811c
author Treehugger Robot <treehugger-gerrit@google.com> 1603220646 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603220646 +0000

[automerger skipped] Merge "Merge redfin/bramble support." am: 30a1066c7a -s ours

am skip reason: Change-Id I2c4d217b0c09808c8ee1718a33325b81701383a0 with SHA-1 65c4c0a5c8 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1466543

Change-Id: I54b5ed45cee22ac00e04c5e4f448a6d22c2ad070