Fix incorrect merge conflict to klp-modular-dev-plus-aosp

resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp properly, originally fixed in 35d46778f4 Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
2014-04-16 14:37:06 -07:00
parent 3ee9dc58e5
commit cf72f25981
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -1463,7 +1463,7 @@ public class Resources {
        private final long mTheme;

        // Needed by layoutlib.
-        /*package*/ int getNativeTheme() {
+        /*package*/ long getNativeTheme() {
            return mTheme;
        }
    }