| commit | 960dd343c5590edfa95bc8e696c770e189d8b595 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Fri Mar 05 05:40:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 05:40:26 2021 +0000 |
| tree | 1c20c071c25cdc6499f8aebeb23759bf55f658ba | |
| parent | 753e7770daa9a8f5c2691aaf40263afd10b9add9 [diff] | |
| parent | b84834df76b55ee36d8627b06f2949b1edfe978f [diff] |
Merge "Revert "Use VERSION_CODES.S instead of VERSION_CODES.R + 1"" am: aef89adfdc am: b331ee3ff7 am: 84047d72cf am: b84834df76 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619903 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3fcb639c714b5dba8070d04f471c5507f3b51f3d