summaryrefslogtreecommitdiff
path: root/libs/gui/DisplayEventReceiver.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-06 00:25:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-06 00:25:40 +0000
commit44207d9f954625c692ec5f0e5827591af56f5beb (patch)
treef052aa2562e561340531b447f422ead2ec8d8738 /libs/gui/DisplayEventReceiver.cpp
parentdeda5c54b043e8454dc6c9c0192410a44723cfae (diff)
parent4ff23092eaa507c481d2907a35edac3e52f801f1 (diff)
[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 6b8bf72c06 am: 4ff23092ea -s ours
am skip reason: subject contains skip directive Change-Id: I010af59c65bbc059a4dbf6fb1039ee728732513c
Diffstat (limited to 'libs/gui/DisplayEventReceiver.cpp')
0 files changed, 0 insertions, 0 deletions