| commit | 8e0bfaa8eadbca6bb83e387b081465cf25428a35 | [log] [tgz] |
|---|---|---|
| author | Chenbo Feng <fengc@google.com> | Thu Apr 12 13:00:27 2018 -0700 |
| committer | Chenbo Feng <fengc@google.com> | Thu Apr 12 15:05:02 2018 -0700 |
| tree | 20294e9911e49bc0acb8e35134dafbb2fc9d93d1 | |
| parent | 671fb2f900516129486179e0c74704fd9c8302ec [diff] | |
| parent | 6a3a9bc77904d9d849539ca777e59fa3e169d2a2 [diff] |
resolve merge conflicts of 6a3a9bc77904d9d849539ca777e59fa3e169d2a2 to pi-dev BUG: 77678121 Test: ./vts_test_binary_qtaguid_module Change-Id: I45baa1122c449d8235112d3f490fa133e19b6e45