summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 04:14:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 04:14:29 +0000
commit0ec4d40dde3a7476c59bf0ad8e52e7997ea76a27 (patch)
tree05ce82292af622de408f6c89fa38d61493cacbaf
parent61f7dc31750ce4b25bf924e3a06c7e943f7251b2 (diff)
parentcdb84060efa7e234128655cd1ba484ca434c84e7 (diff)
downloadcffi-0ec4d40dde3a7476c59bf0ad8e52e7997ea76a27.tar.gz
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: cb16c1f6cc -s ours am: 244a6e4f9e am: cdb84060ef
Change-Id: I72f675c500857895661d48c95e0b422ff304a40f
0 files changed, 0 insertions, 0 deletions