summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2016-01-20 18:39:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-20 18:39:49 +0000
commit9e367f110fafee6dd17313518257771ad962d9c8 (patch)
tree4a38d981fef0682951f25a6cbb588105046dd40e /annotations/generate_annotated_java_files.py
parent8c894eedbbef6ccc2b9dec6b66b25e4e0b8ab0f9 (diff)
parenta7181d813034f8cbb4421be1ec24e804d0909128 (diff)
DO NOT MERGE Cache intermediate CA separately am: 1cca3cd728 am: 14a7e6b598 -s ours am: 1e46b7e2d9 -s ours am: 5b2545cebf am: 50360e4e64 -s ours am: 4974d10c51
am: a7181d8130 * commit 'a7181d813034f8cbb4421be1ec24e804d0909128': DO NOT MERGE Cache intermediate CA separately
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions