summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2018-06-06 15:24:17 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-06 15:24:17 -0700
commit0d6753d1ed8c44064d3110c910e2e0155621123e (patch)
treea73040a11fb19a3fa5295aeb0c2638d1031de0ef /tools/aapt2/java/JavaClassGenerator_test.cpp
parent34878a27d7aceda82de52ef8cf463f2a1674ae93 (diff)
parenta1cb9733665fe2565be70dd3a1e35f1e95cc04d5 (diff)
Merge "Always cancel clock animation" into pi-dev
am: a1cb973366 Change-Id: I20406102b51c0dcbbd4a1fc122b89f98e2412607
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions