commit | 985639b823d57218d43cc9a5a64cbd336dd6c9ea | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Mar 20 23:24:29 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 23:24:29 2020 +0000 |
tree | adaff9f3c800a3efbcb5bb89594e8e0fa604bd5b | |
parent | 2a85b04ffd9ab5c6872ad57ab3a4c92b790dc887 [diff] | |
parent | a815250b76499810d5d281248e3293d72548ca07 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861 am: a815250b76 -s ours am skip reason: subject contains skip directive Change-Id: Ifa7b6ec57c327f47b6007fcbe32299be00e12780