tree b6aab616dc8a647429515d4a4a2c0e610669218c
parent 9b5c4bc0b2925cfff9ec20ee3d6d77a13f2db3c4
parent 2dbf06da2ba8be9673de105fd7043a93df62d36a
author Kevin Hufnagle <khufnagle@google.com> 1474930348 +0000
committer android-build-merger <android-build-merger@google.com> 1474930348 +0000

Merge "docs: Changed Android branding guidelines for clarity" into nyc-dev
am: 2dbf06da2b

Change-Id: If467d3a325ff6ddf517dede30279e6c8417ba3d2