| commit | 61884754c9c3bb1d0dea38ef6ec95e9c95892f70 | [log] [tgz] |
|---|---|---|
| author | Jordan Demeulenaere <jdemeulenaere@google.com> | Tue Dec 20 11:12:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 20 11:12:55 2022 +0000 |
| tree | cd304850019ac765ef63b7c619959d922148750e | |
| parent | 7fd6aca3cedb331c508c74c934ee36a737c816cb [diff] | |
| parent | 7817e07ef3c3a296426512b43da9c8060fe40b36 [diff] |
[automerger skipped] Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev am: c14e8fec59 -s ours am: 7817e07ef3 -s ours am skip reason: Merged-In I97660c5a9a2758c5e19d037e635c21456b6085c3 with SHA-1 a13520b42f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20745148 Change-Id: I94b13e4b08a27fa1d6084aa0e3073c58494c4438 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>