commit 8c70b471e3f7281634a730ce0c075ae1a67211d5
author Sandeep Siddhartha <sansid@google.com> Thu Sep 26 20:35:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 26 20:35:46 2013 -0700
tree dfbf714bc03a9aab14975e67c013a9ce147f632f
parent ca29efdedc20e963dd9f6f56ed4223da3f681284
parent a6125efb66dd7554f2a84804baf6cc02a1334f20

am a6125efb: Fix build break

* commit 'a6125efb66dd7554f2a84804baf6cc02a1334f20':
  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);