diff options
| author | Anton Hansson <hansson@google.com> | 2020-05-25 08:58:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-25 08:58:07 +0000 |
| commit | 601fdd97b61ee2a1bc5e64441e77d494a49be6af (patch) | |
| tree | ce6b27814a434150c6d6e4e64cc2ef5a7199fad7 /java/java.go | |
| parent | 1834358aa5bd3fc726ef09182734004f9fd9cb37 (diff) | |
| parent | c5e13279ad9d146e12d97f937afc45c958c1e3af (diff) | |
Merge "Don't require merge_annotations_dir for annotations_enabled" into rvc-dev
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions