Skip to content
Commit b3b9e38f authored by Tiger Huang's avatar Tiger Huang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Prevent infinite layout while hiding nav bar on... 

[automerger skipped] Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev am: a41c75d6
am: 85a2ecd9  -s ours

Change-Id: Idbb741af07855683da59fa8e07768e335047f734
parents cad75d98 85a2ecd9
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