tree dce4a64831fc20495c958e46b8bfc7a0af80aff8
parent ad24b9380f5ff0a119ff45d7175682f1295d92aa
parent 44200fcbe3579c5c918d6d9fa8dc32ccea6e85a7
author Tyler Gunn <tgunn@google.com> 1538000276 -0700
committer android-build-merger <android-build-merger@google.com> 1538000276 -0700

Merge "Remove unused code-paths in Telephony." am: 6f1fe13d80
am: 44200fcbe3

Change-Id: Icec97c6d2806a40cc7f7e1801ab9f4a84a6674e1