tree 645fc4483632901d668a8a13f46d647f0ca8fe5f
parent c08360eb256372a5ee7a49750a4f7a78cc25fae1
parent 9c8913b24669be536c246210eedfb1f24af8c55d
author Dan Willemsen <dwillemsen@google.com> 1519927842 +0000
committer android-build-merger <android-build-merger@google.com> 1519927842 +0000

Merge "Replace droiddoc.custom_template_dir" am: e04dc3f7ad
am: 9c8913b246

Change-Id: I58bf568931841c2581cdb14abd0c736f51dd2885