summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-11 22:10:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-11 22:10:13 +0000
commit1a1d1d772406baf99c4434d7166401aaaada5850 (patch)
treee5c9438a98c09f3c01fd58a3d72853c0de3c5473 /annotations/generate_annotated_java_files.py
parent2ddc778b9d0446e4265a491cddefd7931d86c68d (diff)
parentf5ec68163592b408ffcdaa4fe557e46a18a45dfb (diff)
[automerger skipped] Merge changes from topic "am-98c2fa31b1774177893a0478969b96cd" into pie-cts-dev am: 75ac3930a5 -s ours am: c31817fef8 -s ours am: 70b1308c7e -s ours am: f5ec681635 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Change-Id: I86e712390334173dab284dcfacc6b60be46ed3d6
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions