tree 9df246bef64b1737414ab3411bf90a50f526437d
parent cb56978912772a8e3d741b643ad1e491c97af22f
parent b82f7fd2c0f7574f5bbd78fbeccfd12b3183bcee
author Android Build Merger (Role) <android-build-merger@google.com> 1467058885 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467058886 +0000

Merge "Merge \"Fix mistranslation from the NDK changelog.\" into nyc-dev am: 95fbc2de1b" into nyc-mr1-dev