diff options
| author | 2016-07-21 22:19:07 -0700 | |
|---|---|---|
| committer | 2016-07-21 22:19:07 -0700 | |
| commit | 846799d693adc83ba973d8fef6d73dc53a994d1d (patch) | |
| tree | 0efa9d03c0ee4442b8e42e0d86f90ea1a561e63a /libs/hwui/ProgramCache.h | |
| parent | 32a2864389661520682f65856eb027dea57d76b5 (diff) | |
| parent | f53bfc911fa88c15b25f38553a5647ad00f221a3 (diff) | |
resolve merge conflicts of f53bfc9 to master
Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd
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); |