| commit | bc766b0801283fd8d01923add91b66ace1c6a6be | [log] [tgz] |
|---|---|---|
| author | Ady Abraham <adyabr@google.com> | Tue Sep 14 21:25:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 14 21:25:04 2021 +0000 |
| tree | d983a143c8b12738ed82cf34bbc5bbdcdc491893 | |
| parent | ed6e5ae36f26900458638770e55c4067f79e7cee [diff] | |
| parent | 5d8dc5cc19860b458afaeac793e2c1e9abd3a7e5 [diff] |
[automerger skipped] Merge "SF: return the active display from getInternalDisplayId" into sc-v2-dev am: 403a0be805 am: 5d8dc5cc19 -s ours am skip reason: Merged-In Ief856c736c78ab9ddca3c4ffccd8e374c050b0bd with SHA-1 2a0066dad5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15305460 Change-Id: I3870cf5d52202802079eee55287ec8a8c4e280dc