tree ab97d724b4c9ea404ebf123ca45348cdc0f679af
parent 54babc292971569ca70b4bd40abd65113e29956c
parent 9914485eab8f896dfb55649cecc57720779404c3
author Long Ling <longling@google.com> 1567626349 -0700
committer android-build-merger <android-build-merger@google.com> 1567626349 -0700

[automerger skipped] Merge "[DO NOT MERGE] Move device config high_refresh_rate_blacklist to display_manager" into qt-qpr1-dev am: 402c7bb521
am: 9914485eab -s ours
am skip reason: subject contains skip directive

Change-Id: I2b319866ef159eb59c1d1d6c64c88570a1bbaeaa