| commit | 36abaf22d7a4dd2e19170c04937cd6d86ac1110b | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Wed Mar 03 19:05:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 19:05:30 2021 +0000 |
| tree | 9bf4c026f812cb1d1d9896c6a6e3a7634edcca49 | |
| parent | bdad47c1033eefbd2ffdb1d11ae0b76e5d84bf82 [diff] | |
| parent | 9d9910483f49f10dedbff2a1b8fe0c8a4c4255c6 [diff] |
Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: 63732807cc am: 9d9910483f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f3416d79ce8936f44edcf87231b902ea875f1d1