commit 2caa0a6070657a7985e11dc1c9f3174ff93d3f81
author Jean-Michel Trivi <jmtrivi@google.com> Fri Sep 05 23:36:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 05 23:36:44 2014 +0000
tree b278cf0a9e9c89af24f3b2ab51837ad3bbfaf41e
parent 5341f94a191ae57b138f97cd516842bcf04c0609
parent 8aacb2e96c62887d5418851396f903b6cc4bb5ab

Merge "AudioAttributes: unhide CREATOR" into lmp-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index e39cc22..84ee18e 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14050,6 +14050,7 @@
     field public static final int CONTENT_TYPE_SONIFICATION = 4; // 0x4
     field public static final int CONTENT_TYPE_SPEECH = 1; // 0x1
     field public static final int CONTENT_TYPE_UNKNOWN = 0; // 0x0
+    field public static final android.os.Parcelable.Creator CREATOR;
     field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1
     field public static final int USAGE_ALARM = 4; // 0x4
     field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb

media/java/android/media/AudioAttributes.java

diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java
index 308f783..9b644f4 100644
--- a/media/java/android/media/AudioAttributes.java
+++ b/media/java/android/media/AudioAttributes.java
@@ -530,7 +530,6 @@
         }
     }
 
-    /** @hide */
     public static final Parcelable.Creator<AudioAttributes> CREATOR
             = new Parcelable.Creator<AudioAttributes>() {
         /**