diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-19 15:25:05 -0700 |
| commit | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/vcs-log/impl/vcs-log-impl.iml | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
| download | idea-060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/tests.gant
Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784
Diffstat (limited to 'platform/vcs-log/impl/vcs-log-impl.iml')
| -rw-r--r-- | platform/vcs-log/impl/vcs-log-impl.iml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/vcs-log/impl/vcs-log-impl.iml b/platform/vcs-log/impl/vcs-log-impl.iml index 5668888806ac..304affc03123 100644 --- a/platform/vcs-log/impl/vcs-log-impl.iml +++ b/platform/vcs-log/impl/vcs-log-impl.iml @@ -21,6 +21,7 @@ <orderEntry type="module" module-name="spellchecker" /> <orderEntry type="module" module-name="vcs-log-graph-api" /> <orderEntry type="module" module-name="testFramework" scope="TEST" /> + <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" /> </component> </module> |