diff options
author | Yan Yan <evitayan@google.com> | 2021-03-03 19:05:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 19:05:30 +0000 |
commit | f69232e88b4762a97bc7a8b842540f6bb929affc (patch) | |
tree | a4399d76489c7d394f4efbabe91e8d994e6c24ce /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e6d119c2e160a2c57c44613fd818334f6941cecc (diff) | |
parent | a5d4ead8ededf35421f2170c9fbe51bbcc6fbffe (diff) |
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa8270 am: a5d4ead8ed
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f3416d79ce8936f44edcf87231b902ea875f1d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions