diff options
| author | Tao Bao <tbao@google.com> | 2015-08-31 22:57:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 22:57:44 +0000 |
| commit | a42870fcd6bbd15326fea45e156bd2462bf8a78a (patch) | |
| tree | e2492e4a5452e4450bb49f07d42a0b68c8141d49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6a9baca06eb7ec8e05c0968bbd5455bdf1abb0a2 (diff) | |
| parent | 188a33c7acb53fb59364b82a41ec9270f6aef5cf (diff) | |
am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '188a33c7acb53fb59364b82a41ec9270f6aef5cf':
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions