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