diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-07-09 17:59:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 17:59:49 +0000 |
commit | 9fc9de3b3374edddd7f3108a1b47769bf25d569e (patch) | |
tree | 6cdfc3ddacac836f4fd40cee8ad27ad9aa3fe39b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 159efe23e652952ada23d81aa2f2e308129dffa3 (diff) | |
parent | 2e6fce3137df876aab597935aaaf508802d17d06 (diff) |
am 2e6fce31: am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit '2e6fce3137df876aab597935aaaf508802d17d06':
Timeout when partitioning takes too long.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions