| commit | 05605994afe83d507c3044e9b9a5a06b31f9064d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sun Aug 15 04:19:41 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:19:41 2021 +0000 |
| tree | a33bb958b28bfe349fd222b58c677b407925712f | |
| parent | 31f16c5d71f4594cbd46ce33a95deb3b579415a1 [diff] | |
| parent | 18ef17550599e67b6f3efa90c09b54d1e2b828a6 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 32ca6e8190 -s ours am: 18ef175505 -s ours am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd871 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15550161 Change-Id: If7c27f53bc7359c6e2e6c7816be9349cd5dad015