commit | d5458444002efe4b70f39707052e3d646028f8c2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 16:37:25 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 16:37:25 2019 -0700 |
tree | a7b55376118488845a4df9a2996746eeb74ada30 | |
parent | 1801ce88552e70a732cb5409d59f00aad8e2bf08 [diff] | |
parent | 1e1d3c87254feb60c34e27a12c253f2ae64cd92c [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c8725 -s ours am skip reason: subject contains skip directive Change-Id: I3bbbadb9a5e572eeabb78e16474578ae24dfaed1