| commit | 7ffa156a732ecd7e165742473c1ed865bcf32c93 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 25 01:53:51 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 01:53:51 2021 +0000 |
| tree | 801585e40b05d63d1070ff1f4755fbf914437e1a | |
| parent | 6ed7c1c5235a1b62d9c5375fc402f0cf6fbd9dbe [diff] | |
| parent | f652408e6c5ea228080b428d14bdad29b7ad8f2e [diff] |
Merge "Use a longer test timeout in integration test" am: f652408e6c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287 Change-Id: Ia76f196039f7d748f47bd4e9a62eb59c8ad1b116