[automerger skipped] Remove dependency on dalvik.annotation.compat.VersionCodes am: 8fca45318d am: 8b98694fdd -s ours am: 5121dd136b -s ours am: 115f3cf9df -s ours am: 481aded3af -s ours
am skip reason: Change-Id Ib0632a3eccfed73d66a51afc0ad6aa50c0311501 with SHA-1 1d6554d72d is in history
Change-Id: Iabb8eb652d467aeed01d15ffb1f1e776a1fa872f
This commit is contained in: