tree 4c866f730d19d22036b7beb59ae8fe0f552c21f5
parent 54b88c93b39d62b59b800e96d43850440819fc8d
parent b4e5175b1a37c47ff5ed2e250903f625d0fecf80
author Treehugger Robot <treehugger-gerrit@google.com> 1631032749 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631032749 +0000

[automerger skipped] Merge "Add suppressLintAnnotation on state.java" am: 0fa9d2ef6b -s ours am: 55d23401db -s ours am: b4e5175b1a -s ours

am skip reason: Merged-In I02aa127e8e07f239561f4f2a3bbdfc6fccb82f7f with SHA-1 4acdb1beff is already in history

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

Change-Id: I554c0189ea4d46f45f28c3510bd692a7d90726e2