diff options
| author | Victor Chang <vichang@google.com> | 2016-06-06 10:30:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 10:30:42 +0000 |
| commit | d2cf835880f2207e2df090599130f32ccb73f23d (patch) | |
| tree | 6e7d1dbd5b6d6e450b49f8fc00889c6d86abbc26 /tools/aapt2/diff/Diff.cpp | |
| parent | 13c2764cef15b9fe4b67f98be458f3108a9137f3 (diff) | |
| parent | 265f4113ee42e89f324b087a81044a9f1dab457e (diff) | |
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee
* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions