summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMark Chien <markchien@google.com>2020-05-29 06:38:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-29 06:38:55 +0000
commitdd7290d3b85f15954c94a5026d0fe3a2a74d277d (patch)
tree32ef6d278071e18d1829c899d7e1dfc642212e29 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3225fadcc4d46cd5bc430fd1ed1675230ab35395 (diff)
parent3c0ed407d9b3948be5aa12c7b890fba706a82089 (diff)
[automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: ecc444832f -s ours am: 3c0ed407d9 -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 3639c015f2 is in history Change-Id: Id4febbdbf75c4acfaa4a62f8124314608fb494b5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions