diff options
| author | Tao Bao <tbao@google.com> | 2015-09-01 16:09:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 16:09:35 +0000 |
| commit | 5ddf4c288f873180b0b59d35b9400885648e7cc2 (patch) | |
| tree | a25d81f40cf4857155c70096b94a06662ea3001b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b0cf4a6517c5cbef8ac5a9b96e254905cfa32183 (diff) | |
| parent | 3dc5895d9f9ba6b1c23231f41a2ee2aeb9f6358a (diff) | |
am 3dc5895d: (-s ours) am f86894cb: am a42870fc: am 188a33c7: am 7b7a3e75: am 0bafa33f: (-s ours) am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
* commit '3dc5895d9f9ba6b1c23231f41a2ee2aeb9f6358a':
[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