diff options
author | Chad Brubaker <cbrubaker@google.com> | 2015-11-11 20:46:48 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-11 20:46:48 +0000 |
commit | 669692234b095371790af3a8a8054ba4af79b283 (patch) | |
tree | 6d7f42a82be2122c1a718194bf1b6e9a827ad9e9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bdb94fe2ce45325f2f569f76a85f8183d0fc7488 (diff) | |
parent | 70b2eede18476f3a7d6344ffdc18b40f07bf4b5f (diff) |
Merge "Add NetworkSecurityConfigProvider" am: d1c469e876 am: 8c89f4d28c
am: 70b2eede18
* commit '70b2eede18476f3a7d6344ffdc18b40f07bf4b5f':
Add NetworkSecurityConfigProvider
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions