tree c861fadc388340839025a216de8d4b7f17869f73
parent 306d0510b64b7a2a04a105cbd4f828b9db5a4029
parent c28a194e9a6f5dd8ae8b95f528ce0018c0e7411b
author Allen Su <allenwtsu@google.com> 1617471092 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617471092 +0000

Merge "[RCS]Impose base64 on KsNaf" am: c9390bc55b am: 52f03fd7cb am: 16a51d9f1d am: c28a194e9a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1662383

Change-Id: I481ec796a807beec4dcb2f1e52b4de2b0e542c2b