tree f9dcc6fa2427d12acdbad6068ebea073a2702aa7
parent f036732c195619d1064ecea86a5e9a44cce37175
parent fd216ae3f39fc4306ddcd89d2267d46c7ea50f1d
author Chia-I Wu <olv@google.com> 1534490097 -0700
committer android-build-merger <android-build-merger@google.com> 1534490097 -0700

[automerger skipped] surfaceflinger: silence misleading virtual display errors am: 99b4619cfe
am: fd216ae3f3  -s ours

Change-Id: I31808d7f29f76cb65df9c41a9bdbd627b6b7e93e