summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-07-02 16:07:46 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-02 16:07:46 -0700
commit90d946ffe405bcf53fec18c9c1d9d271dd3b2677 (patch)
treee83a6bbe988bc6f6d6c0ca1003d760505670084b
parent8bd3cf26675ac3ffb6a70f0617603ff4a4fce95c (diff)
parent499f54e9042083a03ec79efa125f7e288070fed5 (diff)
downloadwlan-90d946ffe405bcf53fec18c9c1d9d271dd3b2677.tar.gz
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: f658c92c32
am: 499f54e904 -s ours am skip reason: subject contains skip directive Change-Id: If5407742002ddc3c018fb2257577250f91dd7d0e
0 files changed, 0 insertions, 0 deletions