summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-09-08 16:22:22 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-08 16:22:22 -0700
commitac700421ccf1beb4339a17a4b57af555d50e2192 (patch)
treee83a6bbe988bc6f6d6c0ca1003d760505670084b
parentc05ffcd582f6ef1ac4dea4aa90caef7684e80f9e (diff)
parentb7145a7f301f5c4e01892a623d5a993607c3b837 (diff)
downloadwlan-ac700421ccf1beb4339a17a4b57af555d50e2192.tar.gz
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 8aa679f481 -s ours
am: b7145a7f30 -s ours am skip reason: change_id Ib09a80be728bf688d59861e0d37a5a7b89b8f9bc with SHA1 b24826c6e5 is in history Change-Id: Id5bb1d2ab56105168177d210e31143026bb9b4bf
0 files changed, 0 insertions, 0 deletions