diff options
author | Mark Chien <markchien@google.com> | 2020-05-29 06:38:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-29 06:38:49 +0000 |
commit | 3225fadcc4d46cd5bc430fd1ed1675230ab35395 (patch) | |
tree | 32ef6d278071e18d1829c899d7e1dfc642212e29 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 74ec735d90134494e48d50b557e77cc6b0e1ad8a (diff) | |
parent | c0718c3b8f7cee20af4950c18b5b2d053d0c7d4f (diff) |
[automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: ecc444832f am: c0718c3b8f -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 3639c015f2 is in history
Change-Id: I8e1a67cf3573d0294e5585cb794ea5265a9486a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions