diff options
| author | Narayan Kamath <narayan@google.com> | 2016-09-09 10:18:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-09 10:18:19 +0000 |
| commit | e59073096e7f106b420cd49c2250c3218a0b347d (patch) | |
| tree | 29507f46183d2e056071de220c34067107126c77 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 646ee94421107fe744a74dc92bdde7fefdd6ac2d (diff) | |
| parent | 00e808b06b71373cddc1fe7f2131f37b126386d7 (diff) | |
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am: 00e808b06b
Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions