diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-16 01:44:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-16 01:44:53 +0000 |
| commit | 00db0826561b23a54db28ed5203fd7eff79c16c7 (patch) | |
| tree | 4f8bbfd0ce821822de63902531ac19894001ae34 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | dd21212fa1a9c907d5d2f80f3de2413f6c14da7a (diff) | |
| parent | 203b43547da94c9fb78931680b99f9db49fc46c9 (diff) | |
am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions