tree fe27a4aebc2f7e1a3404e7647379982296f6cf86
parent 75fb6d4016bc702d7e9fb176d7359a361e02635c
parent cf0120bd86797b55e504ae637f29d0a19077614e
author Lorenzo Colitti <lorenzo@google.com> 1610012991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610012991 +0000

Merge changes from topic "connectivity_jar_in_apex" am: e7ec916be5 am: cf0120bd86

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85d632781cd8eb0850e919cd6bf990fca17f414