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