diff options
| author | Robert Carr <racarr@google.com> | 2018-03-16 03:11:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-16 03:11:49 +0000 |
| commit | 6ac3e7ce1ba9fe83b2a5852c49f4043b40b59f09 (patch) | |
| tree | a882c22118dd3a2d119d2973cb64f5780380c86d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7148bdf94a11ea324526a070c8e7ac4114752f04 (diff) | |
| parent | 82c4ae150c47ab553bc456bb012a60e55b45c317 (diff) | |
Merge "Bump activity stop timeout past ANR timeout." into pi-dev
am: 82c4ae150c
Change-Id: I1df6ebf343abd907da0072d885578130b2da8435
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions