aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeidi von Markham <hvm@google.com>2015-06-06 00:06:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-06 00:06:50 +0000
commit762fad17d4baf271f260bf942a972b632a1bb945 (patch)
tree2f9a5e5eaf30e8d29c7b28220fec97b5b2c10de1
parent35354d7cc7a163090b7135f64de428dce2c30c7e (diff)
parent1d504453c0281fa9e21c34a473724940c962d045 (diff)
downloadsource.android.com-762fad17d4baf271f260bf942a972b632a1bb945.tar.gz
am 1d504453: am 1ee8e117: Merge "Docs: NEW CHANGE#5 for Android automotive changes to cdd Added browser compatibility requirement update for Android Automotive" into lmp-mr1-dev
* commit '1d504453c0281fa9e21c34a473724940c962d045': Docs: NEW CHANGE#5 for Android automotive changes to cdd Added browser compatibility requirement update for Android Automotive
-rw-r--r--src/compatibility/5.1/android-5.1-cdd.html13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html
index c84b1eea..37902ce2 100644
--- a/src/compatibility/5.1/android-5.1-cdd.html
+++ b/src/compatibility/5.1/android-5.1-cdd.html
@@ -985,9 +985,11 @@ specification [<a href="http://html.spec.whatwg.org/multipage/">Resources, 14</a
<h3 id="3_4_2_browser_compatibility">3.4.2. Browser Compatibility</h3>
<div class="note">
-<p>Android Television and Watch Devices MAY omit a browser application, but MUST
-support the public intent patterns as described in <a href="#3_2_3_1_core_application_intents">section 3.2.3.1</a>. All other types of device implementations MUST include a standalone Browser
-application for general user web browsing.</p>
+<p>Android Television, Watch, and Android Automotive implementations MAY omit a
+browser application, but MUST support the public intent patterns as described in
+<a href="#3_2_3_1_core_application_intents">section 3.2.3.1</a>. All other types
+of device implementations MUST include a standalone Browser application for
+general user web browsing.</p>
</div>
<p>The standalone Browser MAY be based on a browser technology other than WebKit.
@@ -4372,8 +4374,9 @@ Removed Locale string requirement.</td>
</tr>
<tr>
<td>3.4.2. Browser compatibility</td>
- <td>Android Television and Watch Devices MAY omit a browser application, but all
-other types of device implementations MUST include one.</td>
+ <td>Android Television, Watch, and Android Automotive implementations MAY
+ omit a browser application, but all other types of device implementations
+ MUST include one.</td>
</tr>
<tr>
<td>3.7. Runtime compatibility</td>