| commit | 90211233b86e440c8c4359a7c1c0b594c8ee0ddc | [log] [tgz] |
|---|---|---|
| author | Xusong Wang <xusongw@google.com> | Tue May 17 00:38:00 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 17 00:38:00 2022 +0000 |
| tree | 830653a0b04655dee08c4db4140c2556dafe4860 | |
| parent | e6623281c97b6fbb27c403a45247c17ffc4d23c7 [diff] | |
| parent | c5a70b44a7b73ae1f7ddcef12e4f9fdde351acc5 [diff] |
[automerger skipped] Merge "Fix bug in Blend that did not use options." am: 92ce74409b am: 4fa761b913 -s ours am: 003fbea428 -s ours am: d09316ddbf -s ours am: c5a70b44a7 -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: Ie8694f817d740020e6d1aca06f58f0a7ac3bd14a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>