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:02 +0000 (09:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 09:09:02 +0000 (09:09 +0000)
commit8ea65f22640576de4bd64ac4abf490bf62e65320
tree65bf4c2677eb98e2173cf0a059b30ef1238c96af
parent304519b9b949157827425a5467496a321e79c3a2
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: I350ceeb794b065cbc735cda75fff010ee31fd9f4