| commit | 53fa571ed704ef6ccf34fe11f595b9be836b7263 | [log] [tgz] |
|---|---|---|
| author | Daniel Bright <dbright@google.com> | Tue Feb 09 19:04:24 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 09 19:04:24 2021 +0000 |
| tree | a965a1b71466c33a608c318bb0640f45b37eb8bc | |
| parent | 9a74d9ece96f7d8603063a0f1a7f8ec098de7db0 [diff] | |
| parent | fd85bb9c33c66ea42295bd15591648b41f853921 [diff] |
[automerger skipped] Merge "Hide NO_THROTTLE_EXPIRY_TIME" am: 14d9b03781 am: 9a3cfbbb73 am: fd85bb9c33 -s ours am skip reason: Change-Id I8888fae0037fd04e1668ab51eff91dd2bcb5e057 with SHA-1 675df99459 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1581423 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1f6e4fe7daa220b911a2702b8778041c9a304b7