OSDN Git Service

Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
authorYi Kong <yikong@google.com>
Thu, 26 May 2016 09:09:08 +0000 (09:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 09:09:08 +0000 (09:09 +0000)
commit5ede03bfd54875cf7d54706306a801d798c81af0
tree60f4c679433ba4c168bedfd9e95337e9b018147e
parente3d6b6956274a2b6036a60f677e1a98c5ec3012e
parent03a1314f2e9040d48488c7cf38dba273ba669284
Merge "Docs: Update content license page to include Javadocs licenses" into nyc-dev
am: 03a1314f2e

* commit '03a1314f2e9040d48488c7cf38dba273ba669284':
  Docs: Update content license page to include Javadocs licenses

Change-Id: Id2217b3e60ac0c5325f2fb1eb3c2fc19445d0577