summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-07-20 18:53:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-20 18:53:06 +0000
commit6245029d119e506253f2438fafa7e0bd4f86e4b9 (patch)
treeb5a90837334bc23dd7ea6403dc5e827013039ddf /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdc2db1fb7b96269f10ea1b5c545ef38186ea63f0 (diff)
parent34052988c8520e45c8b2708d4862e698c3e13985 (diff)
Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81da am: 94e892a3e5" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions