OSDN Git Service

resolve merge conflicts of 0e7d143 to nyc-dev
authorsmain@google.com <smain@google.com>
Tue, 26 Apr 2016 16:45:19 +0000 (09:45 -0700)
committersmain@google.com <smain@google.com>
Tue, 26 Apr 2016 16:45:19 +0000 (09:45 -0700)
commit089e4bbcf508020524b89f8c732b41768d4ea969
tree03b461d9e70e98ed1acc3ca31fbdb1d5329da28e
parent9a611b27fc86dca60666bc96759f0828ca46e494
parent0e7d143722b8904a32dd79f995ad38948b24960e
resolve merge conflicts of 0e7d143 to nyc-dev

Change-Id: Ia597b62ee4cb0befc91aa3b1a9e362223583f352
tools/droiddoc/templates-sdk/sdkpage.cs