diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-02-28 14:12:44 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-02-28 14:12:44 -0700 |
| commit | 0a7f9c015eec55ed61ee8a766579dc20543e9483 (patch) | |
| tree | 3a78ab78193e790ef2033e9e29e6a8e753178b21 /android/testData/dom | |
| parent | 3fd09bd2b5f3a77f815071bfbe151cd68354940f (diff) | |
| parent | ef393f336cc83f3769a4f52b28385387d36c83d5 (diff) | |
| download | idea-0a7f9c015eec55ed61ee8a766579dc20543e9483.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-133' into merge-upstream
Conflicts:
android/src/org/jetbrains/android/run/AndroidRunConfiguration.java
Change-Id: I9f1095f6e6b66eb3e80ed4f8fa0260c2d89c3e15
Diffstat (limited to 'android/testData/dom')
| -rw-r--r-- | android/testData/dom/layout/JavaHighlighting2.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/testData/dom/layout/JavaHighlighting2.java b/android/testData/dom/layout/JavaHighlighting2.java index 47b9e01b1f5..d8aec3f22da 100644 --- a/android/testData/dom/layout/JavaHighlighting2.java +++ b/android/testData/dom/layout/JavaHighlighting2.java @@ -1,6 +1,6 @@ package p1; -public class JavaHighlighting6 { +class JavaHighlighting6 { public void f() { int n = p1.p2.R.layout.main; } |