diff options
| author | Robin Lee <rgl@google.com> | 2016-06-06 10:43:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-06 10:43:51 +0000 |
| commit | 01dbfb8b2e36ffe7b047395f5a66f8196a6fc0d3 (patch) | |
| tree | 1df991cb98391efcba93326fa00ed7a487dbeadb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e473da278f70bda98a08a96f656f639c3e3fd2a0 (diff) | |
| parent | 6cbf4e51199e12d1d935415f6fa38031cb53ac4d (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: 6cbf4e5119
* commit '6cbf4e51199e12d1d935415f6fa38031cb53ac4d':
Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on
Change-Id: I931c5d99282a6350e15aefbf400c90935237e679
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions