| commit | d9e7d240cb9c2ff33474467c71ea952e28168685 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 12 21:05:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 12 21:05:30 2021 +0000 |
| tree | 06e05386c5d6353aa65172c732454878363bee9b | |
| parent | 185089663b76f8f8e9eb97ef73c2107f210fb351 [diff] | |
| parent | 7c6dd474c4c14b9366e2ca7dce15b5d0fbbb2d88 [diff] |
Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823 am: 333c5f633f am: 7c6dd474c4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1546309 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I39309c74c24e0a146d9dd6cd1350b68b460c4e12