tree b8d7c3fee53820f1efbb886d1d9f407c39d699a1
parent 10e3756687008501044f2531552722c65d9cce8b
parent 9fb0bb91c61f6f7649582dabb61e12de98a0cf39
author Santos Cordon <santoscordon@google.com> 1611847948 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611847948 +0000

Merge "Add DisplayGroup ID to DisplayInfo" into sc-dev am: 9fb0bb91c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5fc457bcb1dd786f5968af760409828046f4c12