commit | 5d0822e4d52e3b3e3d71d027e7ed052e2ab02302 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 16:24:42 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 16:24:42 2019 -0700 |
tree | 89a025279902fa18945ed9c3bcaa91f4aeb69eed | |
parent | 2d7a031f4cabf7cd6c776950cc12aba9acdc29c9 [diff] | |
parent | aefd756095c1ec0ea82a571bc330bcce9fcda063 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 7c33185b41 am: aefd756095 -s ours am skip reason: subject contains skip directive Change-Id: I9df474313df17c203d00428d783a371285026e9f