tree 89c8e0f90492a00a73ab963e7b73ec3f18f57eec
parent 17b55fca1527d2c439500fa26265005c98bbe18b
parent d3c499dabc9f267a00e59a05c578083dfc82f96b
author Cole Faust <colefaust@google.com> 1668541429 +0000
committer Cole Faust <colefaust@google.com> 1668541661 +0000

[conflict] Merge "Fix errorprone warnings that should be errors" am: 677d6cd780 am: f9df26ae3c am: d3c499dabc

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

Change-Id: I84d67fdfcc99f9f6fca218d4264ab8e0bc1f1653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>