tree 00e52871d5c241eb0ed71d48bc3e3b65d9b77a0d
parent 2b396f4f90eda4be156aa03e0e9998a1f0b76e37
parent a67424d595be1e0fe29ead7859780a93e3b0a8e8
author Tyler Gunn <tgunn@google.com> 1564680594 -0700
committer android-build-merger <android-build-merger@google.com> 1564680594 -0700

Merge "resolve merge conflicts of ed95429218b507ca4080ad3e14084eb41c03e4db to qt-qpr1-dev-plus-aosp" into qt-qpr1-dev-plus-aosp
am: a67424d595

Change-Id: Ibc295dfa0fb863bfed416073b77b09aed28797e9