commit 1b1b84e96a30b30d1df11948eccdf3bb0a821233
author Hyunyoung Song <hyunyoungs@google.com> Wed Apr 20 17:03:16 2016 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Wed Apr 20 17:03:16 2016 -0700
tree ce133fda053a45fa0971d0990d85b9afe10c293b
parent 529970a1d61dca77e25057335a2e7bb8c3dc9c11
parent f82aba03a71d60e13557f8a5eb8e2fa4f6d627a2

resolve merge conflicts of f82aba0 to nyc-mr1-dev-plus-aosp

Change-Id: I9fdb4b870c11cd9ef1d46727496839743217fac3

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 471c324..4cb6669 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -535,7 +535,7 @@
                 @Override
                 public void run() {
                     mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
-                    mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
+                    mFooter.setLayerType(LAYER_TYPE_NONE, null);
                 }
             };
         }