commit | 6bc3378f3d99371585c9a271733347a88716fd93 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 12:50:16 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:50:16 2019 -0700 |
tree | b9bb832baf7063286a9510d8638eab106b9bf264 | |
parent | 6b0315fbc13f2fa0b6ee6d5344126b095168d808 [diff] | |
parent | c12cc6220827872868bd58d873090c778b95f2f2 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7 -s ours am: 59b1a2f6bb am: c12cc62208 -s ours am skip reason: subject contains skip directive Change-Id: I497b50ed19e38890884a3149b55101c31c092e1a