diff options
author | 2017-05-04 16:06:01 -0700 | |
---|---|---|
committer | 2017-05-04 16:07:10 -0700 | |
commit | 58f138542c0e43b62153fd8876874cce3e5169b4 (patch) | |
tree | 08bcc79a502f900b98737e6a47975384d6ed37f3 /libs/gui/SurfaceControl.cpp | |
parent | 35c170928c235e5066d503014a6c08eebbfa83e2 (diff) | |
parent | 3a75c70a06795ff2d563d3828351ff7c8656c75a (diff) |
Merge commit '3a75c70a06795ff2d563d3828351ff7c8656c75a' into manual_merge_3a75c70a0
Test: Build
Change-Id: If6409a707e1d76a56c445a6286ea5dbde29e7a71
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
0 files changed, 0 insertions, 0 deletions