diff options
| author | Nicolas Prevot <nprevot@google.com> | 2016-06-22 12:33:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 12:33:43 +0000 |
| commit | ea600f9a1270c2bc3e77a8a90f97c6e6e23e9733 (patch) | |
| tree | 1a0fbc5e9036d308e64112e4d9a187c5e4dea0d0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc117965060294004229bb896f9d8e139e713bf2 (diff) | |
| parent | 2058553b8d57ac7156aad6387c0e9b397ce6f265 (diff) | |
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
am: 2058553b8d
Change-Id: I5f7cdfb398f74cd0c0ed172a001094e438190e6d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions