tree 0436757a5db04cf40f06152b6afc213e1dd3ebdf
parent f34b65e68b322a96d538abafe148d1dc2ef565f3
parent 9cb3e1c84739b61fac7d9ef20c60a35b0f2ebfcd
author Xin Li <delphij@google.com> 1561665149 -0700
committer android-build-merger <android-build-merger@google.com> 1561665149 -0700

[automerger skipped] Merge changes from topic "am-02baaf5a9c6341c193ad11a1792752f8" into qt-r1-dev-plus-aosp
am: 9cb3e1c847 -s ours
am skip reason: change_id I1d9f5fe46aed85a9d374a9e91a0058a193f4cf43 with SHA1 09980abea7 is in history

Change-Id: Id925c9fc84ae050bad236a0dcfef2c618e3e1122