commit | da01a09239d533d21f89c88ab4852bba0308fcce | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 15:32:02 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 15:32:02 2019 -0700 |
tree | 9e8f433f6be822b0955c52d702888844d3caf8c8 | |
parent | 211e09de645270d087fec038afaadb8343e45f03 [diff] | |
parent | e9a1af0c87f586915ccd9a48e7774f9651ba5146 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 953aa50f56 am: e9a1af0c87 -s ours am skip reason: subject contains skip directive Change-Id: I3b03d66bb4b3f95a63996c7897775c3cf929b161