commit dd54a9f8672693a7f01fa70bc4d5687c9c64135c
author Michael Kolb <kolby@google.com> Tue Apr 01 21:47:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 01 21:47:55 2014 +0000
tree 391d2ee47dd7ce2f1560950a8a317649a21b83ef
parent e51f7ed3d8f3667b0f034f760fa07e4f18c08736
parent 4bb047fa5e6d43a027bfe1dfe23b3541e3910a31

am 4bb047fa: Fix build after bad merge resolution

* commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31':
  Fix build after bad merge resolution

policy/src/com/android/internal/policy/impl/PhoneWindow.java

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 @@
         }
         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);