summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-08 18:25:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-08 18:25:05 +0000
commitd69042126e320a566c9bf5d5f5647d97a0fd3c00 (patch)
treee96eba0c9e876daba4111fefbaa38863d97398a0 /libs/gui/ConsumerBase.cpp
parentf105bb113f4424a4eb69d34d8ef293dfc56b322d (diff)
parent9024bda8f8b9f687137a26e303fe77e3416af403 (diff)
[automerger skipped] DO NOT MERGE - Merge January 2020 Security Release into master am: b124bd2910 am: 668fc55a8f am: 9024bda8f8 -s ours
am skip reason: subject contains skip directive Change-Id: Ie3c14cdf4d1afb0cc0ab4c3ee519ffa988e56b70
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions