commit | f9571c6b4af6a4ad9f665a0903413de1806a6b34 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 16:32:57 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:32:57 2019 -0700 |
tree | 8aac0574c4d4a38c969936c3215802c3542da071 | |
parent | 7462d52c5e015c04c3ba4efa80905726af837988 [diff] | |
parent | 75d2f76eaf26c6de5227f4e3a382a61bd13b93ea [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 328c875712 am: 75d2f76eaf -s ours am skip reason: subject contains skip directive Change-Id: Ic9888fc7229d77ba721572a4eb49e7b56a2bace8