From 48d88128bdcf0b364dd98f63e2166f24f878fd10 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 26 May 2015 11:50:11 -0700
Subject: [PATCH] Remove temporary javadoc for android.media.AudioFormat

Remove temporary text in javadoc for AudioFormat.
Start javadoc for encoding.

Change-Id: I3df5f868da50b8ba4b42a9f054d5cd472f68069d
---
 media/java/android/media/AudioFormat.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java
index 0030a39f7fcc..ee6d661885b4 100644
--- a/media/java/android/media/AudioFormat.java
+++ b/media/java/android/media/AudioFormat.java
@@ -47,10 +47,11 @@ import java.util.Arrays;
  * at which content is rendered or produced. For instance a sound at a media sample rate of 8000Hz
  * can be played on a device operating at a sample rate of 48000Hz; the sample rate conversion is
  * automatically handled by the platform, it will not play at 6x speed.
- * (more to be added...)
  *
  * <h4 id="encoding">Encoding</h4>
- * <p>To Be Added... stay tuned
+ * <p>For PCM audio, audio encoding is used to describe the bit representation of an audio data
+ * sample; for example, the size as 8 bit, 16 bit, and the representation as integer or float.
+ * <br>For compressed formats, audio encoding is used to describe the compression scheme being used.
  *
  * <h4 id="channelMask">Channel mask</h4>
  * <p>Channel masks are used in <code>AudioTrack</code> and <code>AudioRecord</code> to describe
-- 
2.11.0