Commit cf72f259 authored Apr 16, 2014 by Deepanshu Gupta

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 35d46778

Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e

parent 3ee9dc58

core/java/android/content/res/Resources.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1463,7 +1463,7 @@ public class Resources {
		private final long mTheme;

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