diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-04-16 14:37:06 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-04-16 14:46:24 -0700 |
| commit | cf72f25981606b4e48130890f22f713d41e0d420 (patch) | |
| tree | 10a78840c7f5530732a2f7039ab90fa76e7a9202 /core | |
| parent | 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9 (diff) | |
| download | frameworks_base-cf72f25981606b4e48130890f22f713d41e0d420.zip frameworks_base-cf72f25981606b4e48130890f22f713d41e0d420.tar.gz frameworks_base-cf72f25981606b4e48130890f22f713d41e0d420.tar.bz2 | |
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 35d46778f49c962c990cfc17e521aa80b9e0c016
Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 3889ce0..7318652 100644 --- 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; } } |