summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2016-06-24 19:00:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-24 19:00:24 +0000
commit53539ae535d756612c33deab0c31594aa7470b10 (patch)
tree9359a8625de24626fe2b9c95027ac13c698756ae /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9a2c4f867cab9e595ddf2e342f82fcd65beba4e3 (diff)
parent1156c52b039e9a042c331125f9c5c572b5b98ee1 (diff)
Merge \"Do not load exit animation again if window is already animating\" into nyc-mr1-dev
am: 1156c52b03 Change-Id: I83b51a39eb515703d3cd648086574e4e634f4bea
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions