| commit | 01fdc3f71bc212796c62b53d010c7e0ac2b44445 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Sat May 01 10:25:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 01 10:25:31 2021 +0000 |
| tree | 09b509c794b82d6a7d0419f5de1802e8ca749380 | |
| parent | f022ac19e58080df021f553a96042bcf973a2388 [diff] | |
| parent | a8559261ac53ddbd8158ef1f79586898c21a81a9 [diff] |
[automerger skipped] Merge changes from topics "unthrottle_apm", "unthrottle_on_tac_changes" am: e4df5d375d am: efa5a0e556 am: 259fa8266a -s ours am: a8559261ac -s ours am skip reason: Merged-In I1a7e413015ccdff3d9358cc85605325a4bff3b33 with SHA-1 c8cf1b02a3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692851 Change-Id: Ie14df352b434fa8d72093d342079ca31c4f9e45b