tree cb4f6dbdd8faf42eb2beeb40993d6a9070c9f00c
parent 3b3a7faa1938c5580526c1869255c03d944f1293
parent 02a7a668c40ef4c923456fc3ff21749890fb9f3e
author Peiyong Lin <lpy@google.com> 1525803416 -0700
committer android-build-merger <android-build-merger@google.com> 1525803416 -0700

Merge "[SurfaceFlinger] Fix HWComposer error message." into pi-dev
am: 02a7a668c4

Change-Id: Ic0e3409d9f1dad3863a1e2b80c59ecc992aa819d