tree 0e584d50a0678ed51173a6640caa42d58fd7d8d3
parent 6b860feb421319d3dc2c524a389c5ca9c60b9d19
parent 9f05056ccd18f55444e112ea87daf657f72152d8
author Scott Main <smain@google.com> 1474997540 +0000
committer android-build-merger <android-build-merger@google.com> 1474997540 +0000

Merge "add source.properties file to the offline docs build which is required to get this in the SDK Manager" into nyc-dev am: 6d0e0bdcd5
am: 9f05056ccd

Change-Id: I98b8f6eac44ae4c044a6493b9e2b85c822137f7b