| commit | b103f0d765e7b3ba79bbf843ca855faa03ccd5c7 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Jun 24 19:36:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 24 19:36:58 2022 +0000 |
| tree | 6ae44a01aaee888407f1ac735f14458ef730510b | |
| parent | 1c88dd6b6da86ed6cd776d1f3489d892c3ac3cfe [diff] | |
| parent | 035a929561345aa06025657344757b93c2ed42c5 [diff] |
Merge "Add a system variant of the merged annotations" am: 16d142849e am: 035a929561 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2132126 Change-Id: I1069faa26c031375b8ffb3700c9c8ceb156cbfa2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>