OSDN Git Service

Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
authorTrevor Johns <trevorjohns@google.com>
Wed, 6 Apr 2016 03:12:06 +0000 (20:12 -0700)
committerTrevor Johns <trevorjohns@google.com>
Wed, 6 Apr 2016 03:32:32 +0000 (20:32 -0700)
commita5f006873cb3f918678d97b09ef9094ff0e487dc
treef3b8873410fad5f9c4408c08379b653c194eee74
parent7b67e0dd73766dcceb77fa08ae2d8da1341b3c87
parentebcf3977a28477df6e6fdbad3bf425581d19ccc1
Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev

Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
tools/droiddoc/templates-sdk/assets/css/default.css
tools/droiddoc/templates-sdk/sdkpage.cs

Issue: 28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e