tree dc50f297febfe0729d4f1d8a347f74fa3c15dfd6
parent eb27cd3b68e8554fd3abdd30a3196849294337c7
parent 6aa7534178762edf3088193523af85cc8f80f8d7
author Paul Duffin <paulduffin@google.com> 1571670676 -0700
committer android-build-merger <android-build-merger@google.com> 1571670676 -0700

Merge "Move dalvik.system.VersionCodes to dalvik.annotation.compat"
am: 6aa7534178

Change-Id: I05ffe436b0ca75833569c06ead7e789415a28a60