tree fc530f1ebc3fed7c1b00591d78adc99317e4f51a
parent d2dca73dc756664c241c091b8edc24cd83f886a5
parent 4931429f5a93389416e0356d4900284d8cb3db33
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1574103720 -0800
committer android-build-merger <android-build-merger@google.com> 1574103720 -0800

Merge "Remove usage of Telephonymanager from() hidden API" am: 8e999f22b8 am: fc8b731e33
am: 4931429f5a

Change-Id: Idcd6527f87f8e61e8aba94fa287522e497934f6f