tree 02b9a8471faa248278a9e6a73f9a5722e0015df0
parent 82a11e874a93d99f93261bc6888818188de4e69c
parent a0b5690cb885cb87d571dc13864712a027f6b4c2
author Jiyong Park <jiyong@google.com> 1563266536 -0700
committer android-build-merger <android-build-merger@google.com> 1563266536 -0700

[automerger skipped] Merge changes I2c00af07,I2f49fa7d into qt-dev am: 7610ba915c
am: a0b5690cb8 -s ours
am skip reason: change_id I2c00af07aac4a15770d3acab011a36e2e4803bfc with SHA1 e3ef3c8f0c is in history

Change-Id: I639c02d1f9a76e6a9ac027f01b0216127e206765