Skip to content
Commit 7acf09e4 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is... 

[automerger skipped] Merge "DO NOT MERGE: Use quick_qs_total_height when QS is not disabled" into pi-dev am: ca53cf7f
am: 08f22c1e  -s ours

Change-Id: I028da01c98ba1e1af460b00564849e748ce6d38d
parents 9246e1cb 08f22c1e
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