Skip to content
Commit 59c9c694 authored by Milton Wu's avatar Milton Wu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Move color and display info into DecorProvider am:... 

[automerger skipped] Move color and display info into DecorProvider am: f1fc5d21 am: bfbdafa3 -s ours

am skip reason: Merged-In I1fdcbe4c5e8ee0a54eba03f59b9066e76e5c9a03 with SHA-1 3353759e is already in history

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



Change-Id: Ic4968c78465ca277ac42d88e8060a9126d9c1e2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 484c3019 bfbdafa3
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