tree 5594ce926c8a417585f61ba6e22200f288aa088d
parent 24eedb24f3fbb2598c0f046b40e9cc78b8e746fd
parent 59d98a07a9d780486609586a4919d37dadc6500e
author Aurimas Liutikas <aurimas@google.com> 1605564105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605564105 +0000

[automerger skipped] Merge "Remove legacy style metalava suppression" am: e1bb600fc7 am: 66574f225e am: 1c505e8cda am: 59d98a07a9 -s ours

am skip reason: Change-Id I6d5df95cfca2950ea86872d2f0afc1ba828841dc with SHA-1 1394a019e7 is in history

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

Change-Id: I64bd5ddef60555447dc9953f6208d22fd9ba1f53