| commit | d09316ddbfa48fa731294eb40d2ce5886141fa1f | [log] [tgz] |
|---|---|---|
| author | Xusong Wang <xusongw@google.com> | Mon May 16 23:40:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 16 23:40:05 2022 +0000 |
| tree | adecd550fee43813a62954e3ad7b61ad859928c5 | |
| parent | 721fa921ef26fda2e45fb83afb8f45452a44b4d5 [diff] | |
| parent | 003fbea428d6b67303b0727f338e35e89edb415f [diff] |
[automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce74409b am: 4fa761b913 -s ours am: 003fbea428 -s ours am skip reason: Merged-In Ide2fef96137ffd89e4431cf15be5df398036d909 with SHA-1 a2c6eb2f1a is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2097598 Change-Id: I6fe6cd7db086a148e4ae05b71770b8a4193281e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>