diff options
| author | Xin Li <delphij@google.com> | 2019-06-03 00:32:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-03 00:32:16 -0700 |
| commit | 277dba614aedf06bfbdb6a2b883667b146224515 (patch) | |
| tree | 9a6396fe3c5d372535992837cc0c8b176341c03a | |
| parent | 3166fd4a50bf12d4c19b3ee6f68e5b530f60bd01 (diff) | |
| parent | 4c56b5e0bbfea1cfa8d0c604a4b160e2c74d8f80 (diff) | |
| download | NetworkPermissionConfig-277dba614aedf06bfbdb6a2b883667b146224515.tar.gz | |
resolve merge conflicts of f3206c03ec5943773dae28870ae8eaba2a8a8d20 to qt-dev-plus-aosp am: 25b5637e76
am: 4c56b5e0bb
Change-Id: Id89eb36f46dcea38e78e719c7fc8ee546f9146c4
| -rw-r--r-- | OWNERS | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1,5 +1,2 @@ -set noparent - lorenzo@google.com -baligh@google.com -delphij@google.com +reminv@google.com |