tree 91d410f9ded335ea541fd1b0bc444bc4f2b78c83
parent 4f8399c7ad4f7e14e3846494c9aa2b88bfd343d9
parent 90ab19bb8dec2e444e274ab4c8990545b481ca7b
author smain@google.com <smain@google.com> 1415046013 +0000
committer android-build-merger <android-build-merger@google.com> 1415046013 +0000

am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
automerge: 90ab19b

* commit '90ab19bb8dec2e444e274ab4c8990545b481ca7b':