| commit | f541136171d5711f323660268bbe98a6f53e4b47 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 24 18:38:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 24 18:38:59 2020 +0000 |
| tree | 3b349da92aa31f5091a674c85a61e1772cf09a42 | |
| parent | 10a3417e89b3b236f96b53f1438baa1c6dc6218b [diff] | |
| parent | 70a2b64da731458ed4d560d64724884a29d29b2f [diff] |
[automerger skipped] Merge "DO NOT MERGE Local timeout should cancel remote work" into rvc-qpr-dev am: bfd3ac4d58 am: 70a2b64da7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12686173 Change-Id: I08af7a84b1f975b7cdf649300840e10fbc01414b