diff options
| author | Rubin Xu <rubinxu@google.com> | 2018-03-09 15:15:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-09 15:15:07 +0000 |
| commit | 8dddc5e1f87d7416f5a7edc8d8133fb6159dc13a (patch) | |
| tree | e40bf8b3f601895f6e099570c47ae75b0aec65d2 /tools/aapt2/diff/Diff.cpp | |
| parent | bdc573b39bf5c47eb07ca07e3ed6ac78790c4675 (diff) | |
| parent | a9df845321eaab4b1e237eff6e47dbe3d7e41e1e (diff) | |
Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into oc-dev
am: a9df845321
Change-Id: I0d7f4421d10f977eb9071ba3478da771e58541ca
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions