commit | 23c24d3364b7a3eaa221e1299cdfad310942f21b | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Wed Mar 31 10:45:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 10:45:27 2021 +0000 |
tree | ab99c5e4696371816bb38396415af301b80d48e3 | |
parent | 5e4659c7f9181a829ef9bd566b9bc2b6eeea348c [diff] | |
parent | 45e3d62dfa8250ea0bf11f75f47fa9ab9c420a3d [diff] |
[automerger skipped] Merge "Remove custom annotation libs" am: 355f8c28b1 am: a056f69a7a am: 45e3d62dfa -s ours 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: I98f03bba691b32d9ceafb6be431f7ba9887dcb6b