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