summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-02 16:06:35 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-02 16:06:35 -0700
commite651cdccb24e17d957e670fe4aecf38bf89d2253 (patch)
tree99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent0329684242c7dfa2f93c3335171b3107edc1d9cf (diff)
parentf51db88f7e1f99e5f1467d7abede580766ccfc5b (diff)
downloadsetupwizard-e651cdccb24e17d957e670fe4aecf38bf89d2253.tar.gz
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: aa06a98b93
am: f51db88f7e -s ours am skip reason: subject contains skip directive Change-Id: I4989e4bd104fdf24d7124852d37213e4259077db
0 files changed, 0 insertions, 0 deletions