summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 03:17:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 03:17:13 +0000
commit244a6e4f9e8a7444ce81dabfe7c035e581e7d956 (patch)
tree05ce82292af622de408f6c89fa38d61493cacbaf
parent99c75577d450f37920f493b5d254ea89f6a892da (diff)
parentcb16c1f6ccbe6b48d75fd1ad0a575696e3d6b2eb (diff)
downloadcffi-244a6e4f9e8a7444ce81dabfe7c035e581e7d956.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: cb16c1f6cc -s ours
am skip reason: subject contains skip directive Change-Id: I77688e93a4250169fcfa5641029ece54ddf9f5e7
0 files changed, 0 insertions, 0 deletions