tree 26bfaee53f27851e06a64332bd263d054debecc9
parent 0f1acf874482877442e129a6422fb82ecd327ddc
parent b1299c5329e1995dc5521505b6e4e75dcc365d70
author Kalle Raita <kraita@google.com> 1502213976 +0000
committer android-build-merger <android-build-merger@google.com> 1502213976 +0000

Merge "Faked HWC for SurfaceFlinger testing"
am: b1299c5329

Change-Id: Icd4f3ae2cf5db8e01bcde08461b5e98503c1e11c