aboutsummaryrefslogtreecommitdiff
path: root/METADATA
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 03:54:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 03:54:21 +0000
commitaf2b64a78676ee4c10975c9e243dcf679d5252d8 (patch)
tree4514908306b506c2ca8ddb011fa1ea02b2a2e958 /METADATA
parentdb8b16b12bf42492e957be243dd1b365f9f839f2 (diff)
parenta32cf1a74ece0a007210672ba238ce398c82d078 (diff)
downloadpyopenssl-af2b64a78676ee4c10975c9e243dcf679d5252d8.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 93db1979ff -s ours am: a32cf1a74e
Change-Id: I60b54eb4f13e5d420c8bdeeb352819c18636348c
Diffstat (limited to 'METADATA')
0 files changed, 0 insertions, 0 deletions