diff options
| author | Narayan Kamath <narayan@google.com> | 2016-09-09 11:11:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-09 11:11:20 +0000 |
| commit | 6462be90a89161f4757d1ac6cd8d3f9d9f19c7c5 (patch) | |
| tree | e6399e57894827c5a155301e77f9a3732abb8223 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c0e2b2377abe5b7e8ae3e6b3290a83ac78ee67fa (diff) | |
| parent | 2fd160b0d4107664529bac291708c67a5518d207 (diff) | |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am: 00e808b06b am: e59073096e am: 24ffc9ab47 am: bd6a29cddc am: e9295560cf am: 19ebec6d36 am: 2e8b25701a
am: 2fd160b0d4
Change-Id: I581ede714b9d431b6438117f636538da35ac59b2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions