summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-04-10 04:46:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-10 04:46:39 +0000
commit29078aa0d320adaef9beb3586122a68054b23510 (patch)
tree05ce82292af622de408f6c89fa38d61493cacbaf
parent0bacea74242b09153df418def79b0b5668508949 (diff)
parent0ec4d40dde3a7476c59bf0ad8e52e7997ea76a27 (diff)
downloadcffi-29078aa0d320adaef9beb3586122a68054b23510.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 am: 0ec4d40dde -s ours
am skip reason: subject contains skip directive Change-Id: I117abd3dd03eaa265b166d6ff2465fff1adf9c8a
0 files changed, 0 insertions, 0 deletions