Skip to content
Commit c296c468 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use a longer test timeout in integration test" am: 565f1a95 am: e7da14af am: 660a2c96 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Ie457ecaa93f96d221f75d4eb59d44bc7857c67fb
parents d1020030 660a2c96
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment