tree 1018904965aedd044621bdb11e4f754210757644
parent 049902fae8ed996ecf8b3d4dc7bc733a492b70c4
parent a732be179d7bc06580b66669d6b6c7ebe05b9e01
author Kevin Hufnagle <khufnagle@google.com> 1461704589 +0000
committer android-build-merger <android-build-merger@google.com> 1461704589 +0000

Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f
am: a732be1

* commit 'a732be179d7bc06580b66669d6b6c7ebe05b9e01':

Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba