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:16:25 +0000 (09:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 09:16:25 +0000 (09:16 +0000)
am: 5ede03bfd5

* commit '5ede03bfd54875cf7d54706306a801d798c81af0':
  Docs: Update content license page to include Javadocs licenses

Change-Id: I87ba582c31e6c0dced6523fd89cad0e28ec58a9f


Trivial merge