tree 14f7fbf172c0e0fe2e793f172afd6931e1ae0ce1
parent fc8e47b2870a3f1e079ec08772f91eeb22ad5aa0
parent 91d6a037a8301767ac2afa65367f9d771df5722b
author Denis Zhdanov <deniszhdanov@google.com> 1418281300 +0000
committer android-build-merger <android-build-merger@google.com> 1418281300 +0000

Merge "NPE on configuring library documentation" into studio-1.1-dev automerge: f6969bc
automerge: 91d6a03

* commit '91d6a037a8301767ac2afa65367f9d771df5722b':
  NPE on configuring library documentation