| commit | e7994f031d62222c6f4712a11646fe4aeb246236 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Sat Aug 07 01:33:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 07 01:33:44 2021 +0000 |
| tree | 3e71f5a522c367cbae43f769fb02c5775ba1ca50 | |
| parent | 45d7974f8872dde77bd8efd6a8b75810e5a05a92 [diff] | |
| parent | 34a9a1e8e2c3d456e60eebbe7754ba4c3f005fd3 [diff] |
resolve merge conflicts of 815fb834e5b1fce48f92542dcf812549c85e403b to sc-v2-dev-plus-aosp am: 34a9a1e8e2 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15475022 Change-Id: Iec8c046fa2ba1b2fcbd5a12ef066b3d8f7a6e563