| commit | 899cd8920b4ded09e7c623ef2076ade54ffab24c | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Tue Jan 12 16:22:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 12 16:22:18 2021 +0000 |
| tree | 30bc278a832cdf07453770739a42f1906c360d04 | |
| parent | 88f04b79bdb32a91cf0cd67799ef5e0d9fefbdeb [diff] | |
| parent | 458515e464b1fcd61338076f294c9c4752d60053 [diff] |
Merge "Add new overridable annotation to platform compat" am: 458515e464 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540124 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icdb84460fab8ec12e185a6f78afa0efd8de2d3b5