commit | 306b326b6ef58c16bb9dfa2271a05390127a06fd | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Wed Mar 03 20:22:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 20:22:42 2021 +0000 |
tree | b14f9a8035af8bfde1139f002cab9a25ddea1a37 | |
parent | 57573115c3a525b08e1e7059e41ca58a8cb692cf [diff] | |
parent | f69232e88b4762a97bc7a8b842540f6bb929affc [diff] |
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa8270 am: a5d4ead8ed am: f69232e88b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I057bfdf8528b6f801fd5eb7d0757f19e81efa9a0