commit | 401b3276cfa228ab29cedf93d048f3c006b3189a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 16:05:36 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:05:36 2019 -0700 |
tree | a267001c1eb90dc3c8451c1b8353f469bb678b5c | |
parent | 66e4b1d1cce6d6ee2006e56af215bb20cb9ea820 [diff] | |
parent | 60412fbb381e87f4814078e4bcf78bfdc2ea3d73 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 126e1abf55 am: 60412fbb38 -s ours am skip reason: subject contains skip directive Change-Id: Ia3eacad31290d25dec2eb2c4dc37fcd6fba4298b