tree 20294e9911e49bc0acb8e35134dafbb2fc9d93d1
parent 671fb2f900516129486179e0c74704fd9c8302ec
parent 6a3a9bc77904d9d849539ca777e59fa3e169d2a2
author Chenbo Feng <fengc@google.com> 1523563227 -0700
committer Chenbo Feng <fengc@google.com> 1523570702 -0700

resolve merge conflicts of 6a3a9bc77904d9d849539ca777e59fa3e169d2a2 to pi-dev

BUG: 77678121
Test: ./vts_test_binary_qtaguid_module
Change-Id: I45baa1122c449d8235112d3f490fa133e19b6e45