| commit | 84047d72cf4c2d0e895455e6e2e449c82e7b5ef3 | [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 | d4937f913d28be6b2af16b7591a1a08e0f0c8fca | |
| parent | fc71616a48edd9d40cb468f3b670d45ea702e2a4 [diff] | |
| parent | b331ee3ff7305b44ff7ccf0b5dcd1d9197064806 [diff] |
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adfdc am: b331ee3ff7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8461d24feead79216b01a1c02b5c5bfdd69284b