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