diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-04-16 12:14:34 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-04-16 12:14:34 -0700 |
| commit | 35d46778f49c962c990cfc17e521aa80b9e0c016 (patch) | |
| tree | 41c3a387058ad08b241a92d83a348276c11c5f78 /core/java/android | |
| parent | 82d5f137ed03dcd1020fb554a1d0f3029a826282 (diff) | |
| parent | ec6676ddf682e22dfb56aa54359c9480dfa661d3 (diff) | |
| download | frameworks_base-35d46778f49c962c990cfc17e521aa80b9e0c016.zip frameworks_base-35d46778f49c962c990cfc17e521aa80b9e0c016.tar.gz frameworks_base-35d46778f49c962c990cfc17e521aa80b9e0c016.tar.bz2 | |
resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp
Change-Id: I2fec735ba65f56da7d17022074f8924a259b4bbf
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/res/Resources.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index 3d9daca..3889ce0 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -1461,6 +1461,11 @@ public class Resources { private final AssetManager mAssets; private final long mTheme; + + // Needed by layoutlib. + /*package*/ int getNativeTheme() { + return mTheme; + } } /** |