commit | d6d8e9871b07670cbfd71471aa48971fdfb4251e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jul 01 14:36:51 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 01 14:36:51 2019 -0700 |
tree | a1a15336d1d2117cad26a0beb3fe7ceaa29edb6b | |
parent | de45a1ca927af92dfcd74a8330be7e6f3f89f9e1 [diff] | |
parent | 42e8b5d4831fc99b988ea8b3ef0fd5f39b8925d2 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 42e8b5d483 -s ours am skip reason: subject contains skip directive Change-Id: I1a564d8b62514f2f98b6d091dca95bd2ae97486a