diff options
| author | Robert Carr <racarr@google.com> | 2018-03-16 04:29:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-16 04:29:01 +0000 |
| commit | 4c2bf7a1818714c9fc5376033eae43ae468b78c6 (patch) | |
| tree | 580137383bb5125f7f1071703e17c74df67782e8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7acc6f1dd1df8d25759ae11f61c18c00eebb94dc (diff) | |
| parent | 6ac3e7ce1ba9fe83b2a5852c49f4043b40b59f09 (diff) | |
Merge "Bump activity stop timeout past ANR timeout." into pi-dev am: 82c4ae150c
am: 6ac3e7ce1b
Change-Id: I0656be8fa0ea0326987ca2b73a51b5b1f661b7f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions