summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndrii Kulian <akulian@google.com>2016-08-29 18:51:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-29 18:51:55 +0000
commit934da4e4000e6b7eeb203a2cb3bb0d0975f7e769 (patch)
tree92fc6720ec135b26c6990b503b9ee021322c58b4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfebd5c027c571579933a6d29f65d7efd739b7c23 (diff)
parent128a4419e92ad3bcbbbf29d4ab1550220799b59c (diff)
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am: 128a4419e9 Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions