| commit | d8617b8e9902daa99203ae3ed73922cbae477c69 | [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 | 4cfec456d6497ece057fa5cf99229b4cf54c20e4 [diff] | |
| parent | 0c68d8196e56f79e33d5217efc2b1ee30997ee53 [diff] |
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: c6106ee478 am: 0c68d8196e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8461d24feead79216b01a1c02b5c5bfdd69284b