tree 020a017818c7c774a42a41dd2806c1b6548c8fa1
parent 2aa414032f76442c2cc99acbb7fa15f24f474adb
parent 54ff08570facca5da9050a54793f1887eb992c8e
author Jason Macnak <natsu@google.com> 1626991472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626991472 +0000

[automerger skipped] Merge "Make display unique id stable across x86 and x86_64 builds" am: 548e116f64 am: e149681487 -s ours am: 4b58dc7a26 -s ours am: 54ff08570f -s ours

am skip reason: Merged-In If15b66775fa48f14cc56bbd23536b61844b7ae37 with SHA-1 d308b0127b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1771385

Change-Id: Ib98591d026bd2807b5bcae62749d9ddeb2e9f821