summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-19 06:06:14 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-19 06:06:14 +0000
commit0078e53c38cadada33c5bd71a0e89adada6b8592 (patch)
treeeabd1d2abc2da7db38318ae144174a5fb75d96d6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd3ba9bbf1f5c65c3d3272f826c3a66508391be9c (diff)
parent5adf4d96b7cf1d7fb09386af52b14f9a2f241dc2 (diff)
[automerger skipped] Merge "Set a shorter timeout for logging a warn on slow IUserSwitchObservers." into qt-qpr1-dev am: 928add13d4 am: 5adf4d96b7 -s ours
am skip reason: Change-Id I68e3b7220bbac25075e4fd4dad83c3a26b88940c with SHA-1 48a75cbd67 is in history Change-Id: I8b8a61a44e4deece2f4cd6af206e6d53537a12f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions