diff options
author | Robin Lee <rgl@google.com> | 2016-06-06 10:43:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 10:43:54 +0000 |
commit | 51261c6451646067e1fde28e2e62efb65c399b5f (patch) | |
tree | 1df991cb98391efcba93326fa00ed7a487dbeadb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e473da278f70bda98a08a96f656f639c3e3fd2a0 (diff) | |
parent | d2cf835880f2207e2df090599130f32ccb73f23d (diff) |
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: d2cf835880
* commit 'd2cf835880f2207e2df090599130f32ccb73f23d':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions