commit | 2a93290cfdbb650181cebd5121345d6000c27f0b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 15:56:17 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 15:56:17 2019 -0700 |
tree | bf7b681326e75e2b07f49d2a2ccbee39bea7ded9 | |
parent | 6c790cf9bbb9ac178b5bdd7af9dfa248e0766677 [diff] | |
parent | 52bcdd20b881cff5a560808a0d85dabe02c7af34 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 66a3c7f546 am: 52bcdd20b8 -s ours am skip reason: subject contains skip directive Change-Id: Iccf06c59ed3b6ee8ff5231d06ca8eba72a52978b