From 4bb047fa5e6d43a027bfe1dfe23b3541e3910a31 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 1 Apr 2014 14:38:57 -0700
Subject: Fix build after bad merge resolution

Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
---
 policy/src/com/android/internal/policy/impl/PhoneWindow.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'policy/src/com/android')

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index fd0c896..f1db904 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -3001,6 +3001,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
         }
         if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) {
             requestFeature(FEATURE_CONTENT_TRANSITIONS);
+        }
         if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {
             if (mOutsetBottom == null) mOutsetBottom = new TypedValue();
             a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom);
-- 
cgit v1.1