commit | f69f58136c73ebdcf1507be9bb6c695378d7a1dc | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 02 12:48:27 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 02 12:48:27 2019 -0700 |
tree | b8a9d9de8145726a17b5fa41a31c6be327d52347 | |
parent | acedea85cf9918ad904ee3a05f4af29fb8d4ac8f [diff] | |
parent | 3ad76b492c3d4adc354f9bc2f6f958b87f9e6380 [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 734abbe367 -s ours am: 8e4484271a am: 3ad76b492c -s ours am skip reason: subject contains skip directive Change-Id: I43b266924593ea4c0ab47cba4645a805f9fb558e