summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2016-05-23 20:58:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-23 20:58:58 +0000
commit22ff8d07796a9fc382bc364bae490dec9d258ec5 (patch)
tree1449a75ca887254fd69fd40d5d0d21b3a36ef5f3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf2c8fb8620224eecfbc344a203e32e6563afcfd6 (diff)
parent42d4a337a3b1a14f4d9daf6eb8275a01ba20e680 (diff)
Merge "Only resuming starting dontWaitForPause activity once" into nyc-dev
am: 42d4a337a3 * commit '42d4a337a3b1a14f4d9daf6eb8275a01ba20e680': Only resuming starting dontWaitForPause activity once Change-Id: Idb9949737a0ee5cfbabd6fad532f24f7ec769ace
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions