tree 181d59740d9945d1bb110ceab49fb0ca30d0017c
parent b376e445b9ba1526f3d794706f43f4d04d645db4
parent aa87867c709bb6e60196e70291e5cc3ca41653e0
author Chia-I Wu <olv@google.com> 1539823665 -0700
committer android-build-merger <android-build-merger@google.com> 1539823665 -0700

Merge "surfaceflinger: silence an error for non-WCG displays" am: 91fb454435 am: fbae725101
am: aa87867c70

Change-Id: I5f258cf949244ec85e01d5406a146e147899dd2c