diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/util/util.iml | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/util/util.iml')
-rw-r--r-- | platform/util/util.iml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/util/util.iml b/platform/util/util.iml index d0155fd9b0b0..c015e73f13b3 100644 --- a/platform/util/util.iml +++ b/platform/util/util.iml @@ -5,6 +5,7 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" /> </content> <orderEntry type="library" scope="PROVIDED" name="Mac" level="project" /> <orderEntry type="inheritedJdk" /> |