tree a5586aa389f09e4207d47cd30af7a5d4602b4159
parent a3e3deceb10ecc672d197e2b117196611c6d077e
parent 464d4ff72896af37d04d299e868e83d5f49a5cd3
author Wonsik Kim <wonsik@google.com> 1557787704 -0700
committer android-build-merger <android-build-merger@google.com> 1557787704 -0700

Merge changes Id9b40acc,I6ddff3f8 into qt-dev
am: 464d4ff728

Change-Id: I0589f8e1bc04c19f5849cd7adfd91c7ad556fd50