Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 7817e07e authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

[automerger skipped] Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp... 

[automerger skipped] Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev am: c14e8fec -s ours

am skip reason: Merged-In I97660c5a9a2758c5e19d037e635c21456b6085c3 with SHA-1 a13520b4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20745148



Change-Id: I27ab492a294401468876a69c5148b39ed3fd3964
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53d92fdd c14e8fec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment