tree a101416fb98ca509881fa306cb61599ee810253b
parent bb114730622c102efee7b709d85d45ccd483baf8
parent 84e51e03e3861c8f30b78abb63d70d84cbddcbdb
author Chih-hung Hsieh <chh@google.com> 1547503272 -0800
committer android-build-merger <android-build-merger@google.com> 1547503272 -0800

Merge "Fix/suppress surfaceflinger google-explicit-constructor warnings" am: 0c667f03ef am: db59e3e74b
am: 84e51e03e3

Change-Id: I12519726e6f3969f49f49efb67b1a04f363f28b6