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

Browse Source

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: Ib8f0b77eea19bba4390ea440608efbe20e76bec0

...

This commit is contained in:

Treehugger Robot

2021-09-07 16:22:21 +00:00

committed by Automerger Merge Worker

parent 88ac099f2e 55d23401db

commit b4e5175b1a

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