tree 33cfa22c65e461b99f8a79ca5a0ae68f8a25943e
parent dc27bde242c9585361446c1fa44a7b0791e69af7
parent d76cc783f81ad529d81a29a1842b3d5427e8d45f
author Edgar Wang <edgarwang@google.com> 1571073014 -0700
committer android-build-merger <android-build-merger@google.com> 1571073014 -0700

Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev
am: d76cc783f8

Change-Id: I1c5f830f78239541c37990330cfd2eebbe7af0d8