diff options
| author | 2016-07-22 01:53:29 +0000 | |
|---|---|---|
| committer | 2016-07-22 01:53:29 +0000 | |
| commit | 3fb651b0b73c462d96df063e19cc3cfefa249262 (patch) | |
| tree | 1410dcb07572f691134aea7792016f5e74b663b4 /libs/hwui/ProgramCache.h | |
| parent | cc94c31e15ce26914729c2b72cd2806ed54e5eb7 (diff) | |
| parent | 05160d70d14180fef3782a63dff2e822b51c3cf5 (diff) | |
resolve merge conflicts of 5152fd9 to stage-aosp-master
am: 05160d70d1
Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f
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); |