Skip to content
Commit 60cc40c8 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[GraphicsEnvironment] Avoid null access." am:... 

[automerger skipped] Merge "[GraphicsEnvironment] Avoid null access." am: 393215e2 am: 181ff650 -s ours

am skip reason: Change-Id I4f3b86b0a8cfff4fc608b3a59ebf0872db0465ff with SHA-1 d22eebef is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00d8c7f20a08ffd5682d793280a4e0e17af76615
parents 28613f9d 181ff650
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment