commit 05160d70d14180fef3782a63dff2e822b51c3cf5
author Chih-Hung Hsieh <chh@google.com> Thu Jul 21 18:13:31 2016 -0700
committer Chih-Hung Hsieh <chh@google.com> Thu Jul 21 18:13:31 2016 -0700
tree 4f8f6504761b71975a9c7a3790aef427f275fc8a
parent 95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4
parent 5152fd909cf3bb9c7d27f0379f3dc1db619d2b8a

resolve merge conflicts of 5152fd9 to stage-aosp-master

Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3

libs/hwui/Texture.h

diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h
index 9749f73..b72742f 100644
--- a/libs/hwui/Texture.h
+++ b/libs/hwui/Texture.h
@@ -34,7 +34,7 @@
  */
 class Texture : public GpuMemoryTracker {
 public:
-    Texture(Caches& caches)
+    explicit Texture(Caches& caches)
         : GpuMemoryTracker(GpuObjectType::Texture)
         , mCaches(caches)
     { }
@@ -171,7 +171,7 @@
 
 class AutoTexture {
 public:
-    AutoTexture(Texture* texture)
+    explicit AutoTexture(Texture* texture)
             : texture(texture) {}
     ~AutoTexture() {
         if (texture && texture->cleanup) {