diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/jdkAnnotations/java/util/annotations.xml | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'java/jdkAnnotations/java/util/annotations.xml')
| -rw-r--r-- | java/jdkAnnotations/java/util/annotations.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/java/jdkAnnotations/java/util/annotations.xml b/java/jdkAnnotations/java/util/annotations.xml index 330f7a4d0e23..7e499f6ea9a2 100644 --- a/java/jdkAnnotations/java/util/annotations.xml +++ b/java/jdkAnnotations/java/util/annotations.xml @@ -1120,15 +1120,24 @@ <item name='java.util.ResourceBundle boolean containsKey(java.lang.String) 0'> <annotation name='org.jetbrains.annotations.NotNull'/> </item> + <item name='java.util.ResourceBundle java.lang.Object getObject(java.lang.String)'> + <annotation name='org.jetbrains.annotations.NotNull'/> + </item> <item name='java.util.ResourceBundle java.lang.Object getObject(java.lang.String) 0'> <annotation name='org.jetbrains.annotations.NotNull'/> </item> <item name='java.util.ResourceBundle java.lang.Object handleGetObject(java.lang.String) 0'> <annotation name='org.jetbrains.annotations.NotNull'/> </item> + <item name='java.util.ResourceBundle java.lang.String getString(java.lang.String)'> + <annotation name='org.jetbrains.annotations.NotNull'/> + </item> <item name='java.util.ResourceBundle java.lang.String getString(java.lang.String) 0'> <annotation name='org.jetbrains.annotations.NotNull'/> </item> + <item name='java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String)'> + <annotation name='org.jetbrains.annotations.NotNull'/> + </item> <item name='java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String) 0'> <annotation name='org.jetbrains.annotations.NotNull'/> </item> |