summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2016-07-14 20:06:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-14 20:06:43 +0000
commita561d28bddc997302b8db7568a322999ee5c2698 (patch)
tree973db66912b14b0f210555accac8ca8e0571077a /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbdaed68189f0e761204ddb2b85230ed6c5d57551 (diff)
parent5ac1b52aaaa37a9f8705da766fe11f619e3853e0 (diff)
Merge \"Allow no longer waiting for visible activity to be stopped.\" into nyc-mr1-dev
am: 5ac1b52aaa Change-Id: I10b9fc8a66041f32dcfae62cf70ca0315a0185f7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions