| commit | 685d3750394c2b8480a25d08493ec006f30e937e | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Wed Aug 18 00:24:03 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Wed Aug 18 00:24:03 2021 +0000 |
| tree | d71d13c7fb333c7a6419eb7f3ee1fef422ec87cc | |
| parent | 7a486e048001c836794dab6a129eec35c46db9be [diff] | |
| parent | 01b3864c930bb47369c3fc87f1f15655cb3a628d [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 25583eb8d5 -s ours am: 03287911a8 -s ours am: 175e9a1003 -s ours am: 01b3864c93 -s ours am skip reason: Merged-In I7c54a150e6e0eb44d3f81ddc755f49c6dae40fca with SHA-1 d90428555a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/wilhelm/+/15571640 Change-Id: I0b494aa634c1f11d70d1adae2f82d175475d3051