tree 0d35d4b0aa6cb6bbc41661d78183d938641d960d
parent 6d90946e082af3cd607bb34cbb954ad73460f452
parent 1f2fdb0668ed09595445fd6609d23062c6a56cdb
author Remi NGUYEN VAN <reminv@google.com> 1619159734 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619159734 +0000

Merge "Add AOSP certificates for connectivity resources" am: 410973d590 am: 1f2fdb0668

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

Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28