diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-01-16 10:29:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 10:29:49 +0000 |
| commit | 75c6a437a58d820025ad4cd489a9228c81e46708 (patch) | |
| tree | 81f253837ae57cf6d1e25b19194902f32e0183c0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1122d5e760230290d051da54aba1ab8c44d446d5 (diff) | |
| parent | 0174cd26bb1786e6dc7acefd1ae70a0ad2c76543 (diff) | |
am 0174cd26: am f24e4900: Merge "Offer to detect non-SSL/TLS network traffic."
* commit '0174cd26bb1786e6dc7acefd1ae70a0ad2c76543':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions