diff options
| author | Jeff Davidson <jpd@google.com> | 2014-12-17 20:52:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-17 20:52:19 +0000 |
| commit | 0b3718d6b157bf15db9d709d50019f81f06195b9 (patch) | |
| tree | 12df59b5033dc49f61de3cf7145f5428a00975d4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f1b64b4bb8300d2079696ff0d70cce16eda2be4e (diff) | |
| parent | cc4f18309a2a576b282a399a97a9d64d66713b89 (diff) | |
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev
automerge: cc4f183
* commit 'cc4f18309a2a576b282a399a97a9d64d66713b89':
Add global setting for ephemeral network timeout.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions