Docs: Removing extra lossless entry and fixing conflict
Bug: 19283199
Change-Id: I0db1b87e8dea569792d867140581a15e56a5efce
diff --git a/src/devices/audio/terminology.jd b/src/devices/audio/terminology.jd
index fc71197..2d3e98d 100644
--- a/src/devices/audio/terminology.jd
+++ b/src/devices/audio/terminology.jd
@@ -187,21 +187,6 @@
ADC and DAC are lossy conversions with respect to amplitude. See also "transparency."
</dd>
-<dt>lossless</dt>
-<dd>
-A <a href="http://en.wikipedia.org/wiki/Lossless_compression">lossless data compression</a>
-algorithm preserves bit accuracy across encoding and decoding.
-The result of decoding any previously encoded data is equivalent to the original data.
-Examples of lossless audio content distribution formats include
-<a href="http://en.wikipedia.org/wiki/Compact_disc">CDs</a>, PCM within
-<a href="http://en.wikipedia.org/wiki/WAV">WAV</a>, and
-<a href="http://en.wikipedia.org/wiki/FLAC">FLAC</a>.
-Note that the authoring process may reduce the bit depth or sample rate from that of the
-<a href="http://en.wikipedia.org/wiki/Audio_mastering">masters</a>.
-Distribution formats that preserve the resolution and bit accuracy of masters
-are the subject of "high-resolution audio".
-</dd>
-
<dt>mono</dt>
<dd>
One channel.