summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-23 00:12:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-23 00:12:57 +0000
commit60a6df9b95921138f07ae615b5b9a940df59a04b (patch)
tree995dcada92b0aaa07ec3a2ff925cfcdb36ecdd13 /core/java/android/content
parent5f94c4da757f3e6ddcf202d358d6831fb1dd6cb6 (diff)
parentec32ac95dc3142ecec13a8b301a5ef87f5a296ef (diff)
downloadframeworks_base-60a6df9b95921138f07ae615b5b9a940df59a04b.zip
frameworks_base-60a6df9b95921138f07ae615b5b9a940df59a04b.tar.gz
frameworks_base-60a6df9b95921138f07ae615b5b9a940df59a04b.tar.bz2
Merge "Add Context.MIDI_Service to the public API"
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Context.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 3bf3f85..5eacce3 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3098,7 +3098,6 @@ public abstract class Context {
* {@link android.media.midi.MidiManager} for accessing the MIDI service.
*
* @see #getSystemService
- * @hide
*/
public static final String MIDI_SERVICE = "midi";