tree 489cbd765de28b145e92c889465655c66aadc68c
parent 3f722145f77d74b9917f0fd5327b040cbf72324b
parent c9f1a05ae1fbc60c1ef8fd3ad96b83ac80693409
author Wonsik Kim <wonsik@google.com> 1559159834 -0700
committer android-build-merger <android-build-merger@google.com> 1559159834 -0700

Merge changes I3c756d61,Id0f6cf61 into qt-dev
am: c9f1a05ae1

Change-Id: I4c2076032bbbacd406312eca444169e293210b8b