Skip to content
Commit 45fc2702 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Inherit source windowing mode in some cases." am:... 

[automerger skipped] Merge "Inherit source windowing mode in some cases." am: 530fa56b am: 7c30bea5 -s ours am: e55c2042 -s ours

am skip reason: Change-Id Ib1b75145c0b0b38b07bcde2ca66a1d772a2c2d0f with SHA-1 2517de66 is in history

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

Change-Id: I1ac1ee5af6187473caaee003561f4f47eb1a108a
parents aee8e7d3 e55c2042
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