Tyler Gunn da88ca6f10 Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev ...

am: 980582e555

Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef

2017-06-08 20:15:58 +00:00

..

android/telephony

Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev

2017-06-08 20:15:58 +00:00

com/android

Merge "Added video calling data usage per-uid support" am: 36fdb346f2 am: 2f74c02826

2017-06-01 05:53:47 +00:00