diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-03 08:55:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-03 08:55:28 +0000 |
| commit | 0343d526237f967d61b71dd41fb9876c62add317 (patch) | |
| tree | 1811e57caa60f777a48740563f63956c6830ac23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7ed7c6a3cb98569177b7761f31d9f0191c583581 (diff) | |
| parent | a117895548368bb7c1e7c1b9e705ce19ed19acfd (diff) | |
Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c am: a117895548
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions