commit | bc8d41281e4e1f40ebefea5b6f9454d13c449ad8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 12:48:59 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:48:59 2019 -0700 |
tree | cda0042ecda1de4677148bbc487653b94c88b8b4 | |
parent | b50f95d361d33f2028f0e0ba7eae7e9e0b09e6db [diff] | |
parent | 47226fe7d7e862b18d75e287aa9ef657b6b9ba6f [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 6b0fcb78c7 -s ours am: a33eca5cb0 am: 47226fe7d7 -s ours am skip reason: subject contains skip directive Change-Id: I29d730106cab972786f991b09f0ac024e021f2ff