diff options
| author | Nick Kralevich <nnk@google.com> | 2014-02-12 14:41:25 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-02-12 14:41:25 -0800 |
| commit | d5c8044e7e1f1402fdd4a035690329294ab07b33 (patch) | |
| tree | 7963a5beae4395899c6b3892d18f1fd8f08e9606 /core/java/android/app/ActivityThread.java | |
| parent | cbdec7dd8c45f70c678029783ab2f5657f6b36bd (diff) | |
| parent | 1cbea39fe1740d7d1c3e4aa0e4771a99a56c79ef (diff) | |
| download | frameworks_base-d5c8044e7e1f1402fdd4a035690329294ab07b33.zip frameworks_base-d5c8044e7e1f1402fdd4a035690329294ab07b33.tar.gz frameworks_base-d5c8044e7e1f1402fdd4a035690329294ab07b33.tar.bz2 | |
resolved conflicts for merge of 1cbea39f to master
Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5239cc6..30c1e62 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1550,11 +1550,11 @@ public final class ActivityThread { /** * Creates the top level resources for the given package. */ - Resources getTopLevelResources(String resDir, + Resources getTopLevelResources(String resDir, String[] overlayDirs, int displayId, Configuration overrideConfiguration, LoadedApk pkgInfo) { - return mResourcesManager.getTopLevelResources(resDir, displayId, overrideConfiguration, - pkgInfo.getCompatibilityInfo(), null); + return mResourcesManager.getTopLevelResources(resDir, overlayDirs, displayId, + overrideConfiguration, pkgInfo.getCompatibilityInfo(), null); } final Handler getHandler() { |