tree 8582068d848792e50b937f8a45394edae33b86fb
parent c304c1624dbab0d31f14ac96ec99b886032e53f3
parent 8964ef67439f5af072da4abba3a3b3d9b59efd0f
author Benjamin Franz <bfranz@google.com> 1613482005 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613482005 +0000

Merge "Add versioning to app compat framework" am: 80bbdfd100 am: 4fb9af6ced am: 8964ef6743

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d349a5f76f496503e328a4fc70e051a2ccca2b6