diff options
| author | Andreas Gampe <agampe@google.com> | 2017-07-25 18:30:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 18:30:06 +0000 |
| commit | e4ab5cc60d75d17500150fe69c0f85240d2ac1a0 (patch) | |
| tree | bc9095e23119280572b3258dc9f6f538ec0c70f0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7eb1eee0e3ad6aef3f7b4ef78c3ceeb3d0e0c033 (diff) | |
| parent | b665206efc49495d933ce6bb80e21113b922137c (diff) | |
Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev am: 36d8b489d2
am: b665206efc
Change-Id: I598c0889c2912e3696b909ef26f12e8db8d80923
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions