tree ea4906921b42c09339e6f527d3e88f2785c24d88
parent c0ea97729efaf38e26813f50d843de757388d8d5
parent 62d907959d2fbed74d3ea74e4e15a404b8510edd
author Tyler Gunn <tgunn@google.com> 1496952974 +0000
committer android-build-merger <android-build-merger@google.com> 1496952974 +0000

Merge "Block USSD requests via TelephonyManager when carrier does not allow it." into oc-dev
am: 62d907959d

Change-Id: I55bf47eb22ac99de383cc3c419e8c36a76703ba3