summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2020-06-18 08:46:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 08:46:00 +0000
commit6ed0a1517424fbe21d76566d2b001dbd73ddc682 (patch)
tree2f7e4f4a450b6b1234561222fe72512aeeed505d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent19f6e5e758d7ab207a773a2123da88d99c93eee9 (diff)
parentd6a65e658e693ff70aabc327d41597b6790688af (diff)
Merge "Increase timeout waiting for ExternalStorageService to bind." into rvc-dev am: c817e215f9 am: d6a65e658e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894162 Change-Id: I8a0e28a287bf1e5383e34890fb72dc90e3b1885a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions