tree a2f70d3ba965315315e1a2ed86e723dcae7a3f73
parent 8c4b7e9c0fe01e5f6a3fe332bcd425e1d25ef322
parent 8045fc1117d2230cdc1b2ee847aedaf7c73eccab
author Android Build Merger (Role) <android-build-merger@google.com> 1468963586 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468963587 +0000

Merge "Merge \\"docs: Added two new logos to Auto index page. Merge commit \\'b94941d03ee77ed6c0e842683ec8bf5d420298d7\\' into manual_merge_b94941d\\" into nyc-dev am: 86e39225a9 am: b7e80ca81f" into nyc-mr1-dev-plus-aosp