tree 8a212fe61000b48a3614a5c3d0f04cfc00b715cb
parent c9d29066bde61b76a355dfa3beca034dd55d3887
parent ac3167e3ddc9a28d9e8701c540951a61b5268ff0
author Gwen Lin <gwenlin@google.com> 1605062840 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605062840 +0000

Merge "Add KEY_CARRIER_USSD_METHOD_INT to specify methods for USSD requests" am: 3acec4d14f am: ac3167e3dd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372476

Change-Id: I8bfe72f4b2fd496303bacfee9d775ec3636d0dde