summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-07-09 17:46:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-09 17:46:17 +0000
commit2e6fce3137df876aab597935aaaf508802d17d06 (patch)
tree1f11329f69fed1875ceea62ee4c32f6070d7931e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent480f0e734e5b8770b7700e139b6847bfd76b56cf (diff)
parent923f55a549957e4fb1edc24086ee80157e6050bf (diff)
am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit '923f55a549957e4fb1edc24086ee80157e6050bf': Timeout when partitioning takes too long.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions