commit ede7d5ca513cef33757f5880b9c8dbe17080a981
author Dan Albert <danalbert@google.com> Thu Jul 12 15:57:28 2018 -0700
committer Dan Albert <danalbert@google.com> Thu Jul 12 16:31:09 2018 -0700
tree dd6fa8ae4d235671a298fda19cfdda6cca10893e
parent 40923f3b25c18a581ec4e184b89c40e2079633e3

Two more s/Lollipop/Marshmallow/.

Test: None
Bug: None
Change-Id: I1bbbecbc2cfe3db42f14b79ce86a3e091e4b3fa7

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a8eb9a..19426b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,8 +50,8 @@
      * If your minSdkVersion is below 23 or if you were already enabling NEON
        manually, this change does not affect you.
      * CPUs that do not support this feature are uncommon and new devices were
-       not allowed to ship without it beginning in Lollipop, but older devices
-       that did not support NEON may have been upgraded to Lollipop.
+       not allowed to ship without it beginning in Marshmallow, but older
+       devices that did not support NEON may have been upgraded to Marshmallow.
      * If you need to continue supporting these devices and have a minSdkVersion
        of 23 or higher, you can disable NEON explicitly by setting
        `LOCAL_ARM_NEON := false` in ndk-build or passing