Steve Elliott 9b659a55f5 Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: e02dc982ff am: 2baba9dbca am: e499bbd1d9 ...

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

Change-Id: I9a3cfc60e99f7d638a21627602e3f14f76645ae8

2020-06-17 18:47:32 +00:00

..

ims/internal/uce

Add back ImsUceManager status definitions

2020-03-12 17:33:39 -07:00

internal

Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: e02dc982ff am: 2baba9dbca am: e499bbd1d9

2020-06-17 18:47:32 +00:00

server

Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad3e am: 77caef4748 am: 74ec0c3117 am: 5edf334ff9

2020-06-15 09:58:30 +00:00