diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-07-09 17:27:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 17:27:12 +0000 |
commit | 923f55a549957e4fb1edc24086ee80157e6050bf (patch) | |
tree | a6fbbc0fe8b2e5d9328080b4f3ec82fb22e75728 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 381cf2357db23b8554c890f27615857ed8e67256 (diff) | |
parent | e21f6af3b68d3fcfb2de661c100bca2f7f093d88 (diff) |
am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev
* commit 'e21f6af3b68d3fcfb2de661c100bca2f7f093d88':
Timeout when partitioning takes too long.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions