tree 1018904965aedd044621bdb11e4f754210757644
parent 80f3f6b05da7b81e494f286d79d4e71eb05a19d0
parent f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137
author Kevin Hufnagle <khufnagle@google.com> 1461705211 +0000
committer android-build-merger <android-build-merger@google.com> 1461705211 +0000

Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am: 2f5a204 am: ddbf8d2c
am: f63a1c4

* commit 'f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137':

Change-Id: I09a99fd61f157e171c1a873d91c311cac8bfc0c2