| commit | 96291d9ebe1aaab4c25cc08ca2292b6c86fb9017 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Mar 05 05:22:50 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 05:22:50 2021 +0000 |
| tree | 44b1b2035a0c13adfbf3e80e9b2aa499917010b4 | |
| parent | fc189c4f14dc2e122b9393ad7eb6b6ce8db0e232 [diff] | |
| parent | 8886f22a596c70fa8ab65ed5f3fcd3f901a6137d [diff] |
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: d032de0ecd am: fc0d3bb1b1 am: 8886f22a59 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9c4a57e4a54410dc5a86bdfed009b42c74c088c7