commit | 4117bb8201524f2623c5d4109bbb4d21adab99ac | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Aug 15 16:36:36 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Aug 15 16:36:36 2019 -0700 |
tree | 5ed13f83178186fb29afce752b6c6d78a2ab623a | |
parent | a81eeeff14d372e136bec7047fd8379ef5dd1e2d [diff] | |
parent | 5487e82df5a51de2960aac5bf012648b6d0c40ab [diff] |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 5487e82df5 -s ours am skip reason: subject contains skip directive Change-Id: I31a24ffd3834839da5aafb9419d7480febbb4bde