OSDN Git Service

Resolve merge conflicts of a5f0068 to nyc-dev
authorTrevor Johns <trevorjohns@google.com>
Mon, 11 Apr 2016 21:36:41 +0000 (14:36 -0700)
committerTrevor Johns <trevorjohns@google.com>
Mon, 11 Apr 2016 21:55:35 +0000 (14:55 -0700)
commitf719c29ea924ce53c6620d18aaaba6d3ef9c06be
treeec6bcf285bf1e2f1c3f5ad57f781a943c9f1b834
parent758f8728365358e41380c64806fb9cb0f026b980
parenta5f006873cb3f918678d97b09ef9094ff0e487dc
Resolve merge conflicts of a5f0068 to nyc-dev

Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
tools/droiddoc/templates-sdk-dev/class.cs
tools/droiddoc/templates-sdk/components/masthead.cs
tools/droiddoc/templates-sdk/customizations.cs
tools/droiddoc/templates-sdk/designpage.cs
tools/droiddoc/templates-sdk/footer.cs
tools/droiddoc/templates-sdk/head_tag.cs
tools/droiddoc/templates-sdk/sdkpage.cs