diff options
author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-28 17:30:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-28 17:30:06 +0000 |
commit | b75ca9cf4d0ba2a12802c6520cbac142970f0909 (patch) | |
tree | 6cf16071833acf8433dbb828cb605e94e2c11221 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d9bf0f789bb2cd4798d199eca116fdd10d3e0c94 (diff) | |
parent | 91f16ace4f3121a34b038dd453386b9d4daf826a (diff) |
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
am: 91f16ace4f
Change-Id: I93ba6b5f960798344c3abd44caf7db16b1d894a9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions