commit | 9856e6331628e3aabd35e3289e4c4ca71595e5ae | [log] [tgz] |
---|---|---|
author | Peter Collingbourne <pcc@google.com> | Wed Mar 17 22:25:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 17 22:25:15 2021 +0000 |
tree | 4ae1da6a22b1103781eea2c16f6dfd7969184900 | |
parent | 2fa528b97ddb0352ebb0ef9cc16b7a5cdcc50456 [diff] | |
parent | 1dec957d6846c062dd39c5026f6561ef212a00ad [diff] |
[automerger skipped] Merge "Add support for a hw_timeout_multiplier system property." am: 7fe1ca63df am: 3c8dbe30d6 am: 1dec957d68 -s ours am skip reason: skip tag Change-Id I6d7710beed0c4c5b1720e74e7abe3a586778c678 with SHA-1 37374c9b6b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556750 Change-Id: Idd995acc5140d0bef5dce840cc3e0173a70efb01