summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNicolas Prévot <nprevot@google.com>2016-06-22 12:36:45 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-22 12:36:45 +0000
commit39c5f9f02067e877eec64a86266129a981bab9f9 (patch)
tree1493b090a666feadc09d43dd84c2952e7668e01e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1fef349549d7a851d51c77d9e77a08dc00e2a172 (diff)
parentea600f9a1270c2bc3e77a8a90f97c6e6e23e9733 (diff)
Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am: 2058553b8d
am: ea600f9a12 Change-Id: I1b43aabc35b45558c90750cab7314b63ae8d4b60
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions