| commit | 660a2c96420653d5280c48e706ed03de36745cb5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 25 02:36:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 02:36:19 2021 +0000 |
| tree | 3f313e245d88628a862ee6f87677b875fb50bf48 | |
| parent | 25104d78240ad576d5acd831cd1f92974808515a [diff] | |
| parent | e7da14afc452ac172e235933f7e77b042f4aeb57 [diff] |
Merge "Use a longer test timeout in integration test" am: 565f1a95bd am: e7da14afc4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725