summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorGeoffrey Pitsch <gpitsch@google.com>2017-07-18 10:35:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-18 10:35:17 +0000
commit58bc36fd93a88765614c90877d35778446aff94a (patch)
tree35c640620ec613190d326fe58e7373b5e321f453 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentff6bce1e3c8d1c3a86dd6ac94e8b82a0dc3c33eb (diff)
parent3c778dc07adc2d732824abc3e1ec2c5de3a87947 (diff)
Merge "Delay marquee scrolling on lockscreen by 2 seconds." into oc-dr1-dev am: 331a287656
am: 3c778dc07a Change-Id: I59b79e4591868ebd02a5a6f231b092290a878781
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions