commit | 20acc04391f1087f53002c4046338c7dbcc0abba | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 16:15:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:15:27 2019 -0700 |
tree | effc13d50db0c020d2659313accb2a5693d25115 | |
parent | 8072096b58a3c37732238b2b9121a4dfa67f2f65 [diff] | |
parent | 246dfed98b0746736e27c42082f6f2353e326690 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 936824ada5 am: 246dfed98b -s ours am skip reason: subject contains skip directive Change-Id: Ifd1eaefcb135cc7a785df00da5c2d13fd4d52877