[automerger skipped] Merge "Remove custom annotation libs" am: 355f8c28b1 am: a056f69a7a am: 45e3d62dfa -s ours am: 23c24d3364 -s ours

Browse Source

am skip reason: skip tag Change-Id I4583da7bf5849783d6c5e88a762e04a8fe3e8760 with SHA-1 31df3e6e2b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1658119

Change-Id: I1b4de840096f73853f1eaf33a3e9709e778de90a

...

This commit is contained in:

Anton Hansson

2021-03-31 11:04:49 +00:00

committed by Automerger Merge Worker

parent cf4d0c4566 23c24d3364

commit 70155ce40f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available