summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2014-11-07 03:53:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 03:53:14 +0000
commitfedaef0d92e6760fbb8c02368ab74f5f4fe019cc (patch)
tree1cca03ebab29057bc9d66ea0c04ded49569edbc9 /docs
parentc6f5009fdb6aeafbee6db2b3e381f405ff23718b (diff)
parent15127a69f6885f6fda2f60f9f2eafa2752d0f3e6 (diff)
downloadframeworks_base-fedaef0d92e6760fbb8c02368ab74f5f4fe019cc.zip
frameworks_base-fedaef0d92e6760fbb8c02368ab74f5f4fe019cc.tar.gz
frameworks_base-fedaef0d92e6760fbb8c02368ab74f5f4fe019cc.tar.bz2
am 15127a69: am 871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs automerge: 0d7fa2f
* commit '15127a69f6885f6fda2f60f9f2eafa2752d0f3e6': docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075
Diffstat (limited to 'docs')
-rw-r--r--docs/html/about/versions/android-5.0-changes.jd6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/html/about/versions/android-5.0-changes.jd b/docs/html/about/versions/android-5.0-changes.jd
index c1b9f09..f12e83c 100644
--- a/docs/html/about/versions/android-5.0-changes.jd
+++ b/docs/html/about/versions/android-5.0-changes.jd
@@ -45,7 +45,7 @@ API changes,
behavior changes, system enhancements, and bug fixes. This document highlights
some of the key changes that you should be understand and account for in your apps.</p>
-<p>f you have previously published an app for Android, be aware that your app
+<p>If you have previously published an app for Android, be aware that your app
might be affected by these changes in Android 5.0.</p>
@@ -82,9 +82,7 @@ Behavior on the Android Runtime (ART)</a>. Pay particular attention if:</p>
<li>You use development tools that generate non-standard code (such as some
obfuscators).</li>
<li>You use techniques that are incompatible with compacting garbage
- collection. (ART does not currently implement compacting GC, but
- compacting GC is under development in the Android Open Source
- Project.)</li>
+ collection.</li>
</ul>