tree 304bb788a84f7982e3e7a5039d48db00eaae7870
parent 547c982b975f4e4d3a3f075602ef67544b8c7e26
parent aef89adfdc8e5a89605b09edac755041040cf28f
author Yan Yan <evitayan@google.com> 1614921082 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614921082 +0000

Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adfdc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I435aebb51bd0bd0ed3eb68460eb864c1e78e1874