summaryrefslogtreecommitdiffstats
path: root/docs/html/about
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 20:07:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-03 20:07:53 +0000
commit8b5e342b0e24b9bb546456209d9d27480fa233e8 (patch)
treee8871a28a02cd2b004dde7b7f9a5e592a3c6d22b /docs/html/about
parent555c82cd43ef8d11bcf54f023864619869c06411 (diff)
parent76dfc02135abae5337b48fe99a1b8c0a7d95e33a (diff)
downloadframeworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.zip
frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.gz
frameworks_base-8b5e342b0e24b9bb546456209d9d27480fa233e8.tar.bz2
Merge "Doc update: clean up ubiquitous typo "the the"" into jb-mr1.1-docs
Diffstat (limited to 'docs/html/about')
-rw-r--r--docs/html/about/versions/jelly-bean.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index acb2538..71957be 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -904,7 +904,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
<h3>Media codec access</h3>
-<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the the device.</p>
+<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the device.</p>
<h3>USB Audio</h3>