Benedict Wong 1ebbd0bb6b Merge changes from topic "add-ikev2-vpn-types" ...

am: adb79e3b39

Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e

2020-01-22 22:09:41 -08:00

..

ims/internal/uce

Remove phoneId from ImsUceManager

2020-01-15 22:21:10 +00:00

internal

Merge changes from topic "add-ikev2-vpn-types"

2020-01-22 22:09:41 -08:00

server

Use new UnsupportedAppUsage annotation.

2020-01-09 15:20:16 +00:00