tree da7f6725407d4ece9fd372ce4ce8406d5dade979
parent 8db5f2c6ac87e8c6ef41c826c3387851c4565f5f
parent eed98a3e6b5edc56ba915ca24f462c1419f6fd7f
author Xin Li <delphij@google.com> 1572461422 -0700
committer Xin Li <delphij@google.com> 1572461422 -0700

DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I0e23d0577b29d8dd367443ca0b496084776a060f