tree 909ebeeabec8e9bde7e98eed36e43c5d75ab73bd
parent c6088b2d08a604eeb157d3890bf0b8509d6f2d78
author Anton Hansson <hansson@google.com> 1590052291 +0100
committer Anton Hansson <hansson@google.com> 1590056962 +0100

Don't require merge_annotations_dir for annotations_enabled

As far as I can tell, annotations_enabled does not require use of
merge_annotations_dir (although it may have done in the past).

Bug: 157010342
Test: m
Change-Id: I6705522774203b4566f58679bbc2f0c17422c1dd