summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-08-20 02:12:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-20 02:12:22 +0000
commitdc4442f1a698017dc5c700969392497cbc934126 (patch)
tree9b2f306c8df0259004f9fab082b3ae30a200e3a1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcd6ba4120c346842f82e8c4a710e9c4e26db3b67 (diff)
parent2af6ec5198ed6edf7576c19a358afddcc4068ff7 (diff)
am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit '2af6ec5198ed6edf7576c19a358afddcc4068ff7': Fix issue #23361510: Increase assist timeout from 500ms to 1 second
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions