tree 8731878bd1bfe3a327186f3982990d2df86a9fa4
parent 59a4fc21071e19dfd3ab33d50d9fe585e8fe78c8
parent db59e3e74b6cf30732fbae01dfd0dc9ac1a18863
author Chih-hung Hsieh <chh@google.com> 1547498598 -0800
committer android-build-merger <android-build-merger@google.com> 1547498598 -0800

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

Change-Id: I2e446c7efac013ef693e89db56143fed6cbb207e