summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-30 14:25:24 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-30 14:25:24 -0700
commite586ab1245fc0c9e7298ff0ea796e47fa85327a5 (patch)
tree1570144522be0103db9e0da6a21e2c1a0728ea80
parent8e076233b11d5a012fec8f9e1a0d4317cd5b8da6 (diff)
parente6121df7172ce7bcc6a996ab44f1e02e2817ef39 (diff)
downloadsetupcompat-e586ab1245fc0c9e7298ff0ea796e47fa85327a5.tar.gz
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 1058ca68b5
am: e6121df717 -s ours am skip reason: subject contains skip directive Change-Id: Ic8909042252690f62da3ad547670dfc4a14e7e4e
0 files changed, 0 insertions, 0 deletions