summaryrefslogtreecommitdiffstats
path: root/docs/html-intl/intl/zh-cn
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2014-11-19 13:03:45 -0800
committerDavid Friedman <dmail@google.com>2015-01-16 15:42:26 -0800
commitd28a49fb73d0e6604aee482273c54dc1a54982cc (patch)
tree063b871c5a5e0ee7c2715928b82a50a94920ae75 /docs/html-intl/intl/zh-cn
parent8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4 (diff)
downloadframeworks_base-d28a49fb73d0e6604aee482273c54dc1a54982cc.zip
frameworks_base-d28a49fb73d0e6604aee482273c54dc1a54982cc.tar.gz
frameworks_base-d28a49fb73d0e6604aee482273c54dc1a54982cc.tar.bz2
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
Diffstat (limited to 'docs/html-intl/intl/zh-cn')
-rw-r--r--docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd14
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd b/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
index 9c3dd5c..8e20975 100644
--- a/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
+++ b/docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd
@@ -104,10 +104,16 @@ sdk.platform.apiLevel=21
</li>
</ol>
-<h2>API 区别</h2>
+<h2>API Differences</h2>
<ol>
-<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API 级别 20 对比 21 »</a> </li>
-<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview 对比级别 21 »</a> </li>
+<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API level 20 to 21 &raquo;</a> </li>
+<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview to 21 &raquo;</a> </li>
+</ol>
+
+<h2>See Also</h2>
+<ol>
+<li><a href="{@docRoot}about/versions/android-5.0-changes.html">Android 5.0 Behavior Changes</a> </li>
+<li><a href="{@docRoot}about/versions/lollipop.html">Android Lollipop Highlights</a> </li>
</ol>
</div>
@@ -628,4 +634,4 @@ $ adb shell dumpsys batterystats --charged &lt;package-name&gt;
<ul>
<li>{@link android.Manifest.permission#BIND_DREAM_SERVICE}:当针对 API 级别 21 和更高级别时,<a href="{@docRoot}about/versions/android-4.2.html#Daydream">Daydream</a> 服务需要此权限来确保只有系统可以绑定到它。</li>
-</ul> \ No newline at end of file
+</ul>