tree 071e4901b77a032afe004bbfea627bb937c40b84
parent c078fd99dd43a4214c8867ea412f33db6d5b85ac
parent 2db64c2f55f12b7cd40cc0749286a029b6f9eec5
author Chen Xu <fionaxu@google.com> 1542303846 -0800
committer android-build-merger <android-build-merger@google.com> 1542303846 -0800

Merge "new Systeam API for CarrierConfig#KEY_CARRIER_SETUP_APP_STRING" am: 8715c1545e
am: 2db64c2f55

Change-Id: I9eca28cd2d5388424dd432e4fb1ae15a49e00107