diff options
| author | David Stevens <stevensd@google.com> | 2017-08-23 02:25:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-23 02:25:41 +0000 |
| commit | 7f792333c2debd624e021b1f6d4f78ad3ffb4c3b (patch) | |
| tree | 051b009c7b740383ccd649909bbea65871e04f64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f71624480234e0cb8553f6a62997176f0c45bee4 (diff) | |
| parent | bc06e43c492f1c8b5e7141fc8ffb2b756f987ecf (diff) | |
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
am: bc06e43c49
Change-Id: I612edfe64cee0f0a192f56177fc7dff8d7ad9e2c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions