diff options
| author | David Friedman <dmail@google.com> | 2015-01-17 00:23:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-17 00:23:30 +0000 |
| commit | fa66fdd57a494bed0a92d9fb0aadf332395f371f (patch) | |
| tree | 612991861688a6cbe9d54552da3385e6b5d1a087 /docs/html-intl/intl/zh-cn | |
| parent | de0a87007b987a76af2ddd526dd473ad83fbb74b (diff) | |
| parent | d28a49fb73d0e6604aee482273c54dc1a54982cc (diff) | |
| download | frameworks_base-fa66fdd57a494bed0a92d9fb0aadf332395f371f.zip frameworks_base-fa66fdd57a494bed0a92d9fb0aadf332395f371f.tar.gz frameworks_base-fa66fdd57a494bed0a92d9fb0aadf332395f371f.tar.bz2 | |
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
Diffstat (limited to 'docs/html-intl/intl/zh-cn')
| -rw-r--r-- | docs/html-intl/intl/zh-cn/about/versions/android-5.0.jd | 14 |
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 »</a> </li> +<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">L Developer Preview to 21 »</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 <package-name> <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> |