summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-10-01 08:42:32 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-10-01 08:42:32 -0700
commitd34e72117b9900c674360f9d885c2a46f234190a (patch)
tree97649a83da885679caf4986117b992b39265c86b /annotations/generate_annotated_java_files.py
parentcbfe4f34e93a1141e7745ca238e2c432c137914d (diff)
parent25a103f38fe6cf3cb6e352b04e4bcef99b8c94da (diff)
Merge "Add conscrypt API needed by framework to core.platform.api.stubs"
am: 25a103f38f Change-Id: I7865c7d3d0801d43f43f072f5e4a4f5b73a52e3c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions