diff options
| author | Nicolas Prevot <nprevot@google.com> | 2016-06-22 12:33:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 12:33:41 +0000 |
| commit | f5cf319dc92a5b9ed6197ee5ecc9eba37eaeb63c (patch) | |
| tree | 051418225bc64483ea744f98755b80d485f28218 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 30ec4f27324abcc2fa21ca5c13ea2dc97cc831be (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: Ie6995527fb31b9b5f0c272726c80754927770c55
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions