tree 5d5962acd245b9269bf92fbed02311fe88364122
parent 99a568088dff4b2503bf1c0f8a1c589aebedfa72
parent 9afc75d604616579d08f6c15ec14725030e86b9e
author Pete Gillin <peteg@google.com> 1532541087 -0700
committer android-build-merger <android-build-merger@google.com> 1532541087 -0700

Merge "Turn droiddoc's metalava_merge_annotations_dir into a list." am: 8c8fb65ad3 am: c2b639218e am: d12b7f790d
am: 9afc75d604

Change-Id: I749d8e74403a91794526a91c6b538e8ed49113f4