commit | 02b7b34ba6fa72f64c3f8bfd9529847552005bad | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 18:46:10 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 18:46:10 2019 -0700 |
tree | 45a7a3d63e52c9eb01ca2fa8dc593b2682f6cb8a | |
parent | d3ab3c5bf5acd923250ca5a1a170fee036954674 [diff] | |
parent | b1b097aac92ec2486c8d05ac8b58f1f726684c3d [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 2d0968363c -s ours am: 3ab4edf383 am: 3539fde64d am: b1b097aac9 -s ours am skip reason: subject contains skip directive Change-Id: I67aaaa8b17870613aac1055270eceecf02f94a92