OSDN Git Service

resolve merge conflicts of bfa0fff to nyc-dev
authorsmain@google.com <smain@google.com>
Mon, 2 May 2016 22:30:44 +0000 (15:30 -0700)
committersmain@google.com <smain@google.com>
Mon, 2 May 2016 22:30:44 +0000 (15:30 -0700)
commit788f98ae2249e266014b5ab98816f94332540720
tree03bcf6aef331ab524a794b29a77545e986300e15
parent386df80e85e2098a32c41fee4b8b379991b360b8
parentbfa0fffc9f82b78dcfdc76b04bec8f4349f450da
resolve merge conflicts of bfa0fff to nyc-dev

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