commit | 059bc47a0bd49f90f5dff078b1d66d7b5fd71032 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 18:35:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 18:35:49 2021 +0000 |
tree | ee92b96424ac73c05cb9958ce8c63a5af072c43d | |
parent | 436da590539f3a2ef42871ec1041e712191ad419 [diff] | |
parent | 3010764a8a44d869e4e9b76388acaac527522a47 [diff] |
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 3010764a8a -s ours am skip reason: Merged-In Icec03f01321c64d95d0bf1487ee9a1f4ae10529f with SHA-1 3aebb8c20e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15571798 Change-Id: I909607da7366f4099fe31c912a8df073645b7214