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-18 22:18:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-18 22:18:48 +0000
commit780c19eb996abc2003034ce62f6c5e86eb542341 (patch)
treef2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /annotations/generate_annotated_java_files.py
parentf5ec68163592b408ffcdaa4fe557e46a18a45dfb (diff)
parent6fc30a190b772207c27102e9bbebe727365c2d7a (diff)
[automerger skipped] Merge changes from topic "am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours am: e702655798 -s ours am: bb2a72f846 -s ours am: 6fc30a190b -s ours
am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Change-Id: I2c01986f56a37837be825309e5ba9499002caa2c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions