commit cbf285ae0a78f16b0087581eea058faeabd38fd2
author Sandeep Siddhartha <sansid@google.com> Fri Sep 27 07:16:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 27 07:16:32 2013 -0700
tree dfbf714bc03a9aab14975e67c013a9ce147f632f
parent 47e2101d1bc35142fedeaf4bf83e3bceae2fcfa3
parent 8c70b471e3f7281634a730ce0c075ae1a67211d5

am 8c70b471: am a6125efb: Fix build break

* commit '8c70b471e3f7281634a730ce0c075ae1a67211d5':
  Fix build break

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 63168a3..d09a4b8 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4069,7 +4069,7 @@
         Cling cling = (Cling) findViewById(clingId);
         View scrim = null;
         if (scrimId > 0) {
-            scrim = findViewById(R.id.scrim);
+            scrim = findViewById(R.id.cling_scrim);
         }
         if (cling != null) {
             cling.init(this, scrim);