diff options
| author | 2016-07-21 19:14:36 -0700 | |
|---|---|---|
| committer | 2016-07-21 19:14:36 -0700 | |
| commit | f53bfc911fa88c15b25f38553a5647ad00f221a3 (patch) | |
| tree | 78c8438100aad9012251dcfd6ea50d2785e5423d /libs/hwui/ProgramCache.h | |
| parent | 1f38231b7fca008766fdc135b90172fd2b983315 (diff) | |
| parent | 3fb651b0b73c462d96df063e19cc3cfefa249262 (diff) | |
resolve merge conflicts of 3fb651b to nyc-mr1-dev-plus-aosp
Change-Id: I52d56e84620c85638798d949f8eb819387a01902
Diffstat (limited to 'libs/hwui/ProgramCache.h')
| -rw-r--r-- | libs/hwui/ProgramCache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/ProgramCache.h b/libs/hwui/ProgramCache.h index 1dadda1a4c83..9ac885b665e7 100644 --- a/libs/hwui/ProgramCache.h +++ b/libs/hwui/ProgramCache.h @@ -40,7 +40,7 @@ namespace uirenderer { */ class ProgramCache { public: - ProgramCache(Extensions& extensions); + explicit ProgramCache(Extensions& extensions); ~ProgramCache(); Program* get(const ProgramDescription& description); |