tree fa7cf7a6ef2faabb15e8470796be5970b0ecaadc
parent 2aa9dc1174c8de2d251b31704e0aa073ced2a698
parent a41c75d6d05be7183f7303f25cd564cf68bf3a8b
author Tiger Huang <tigerhuang@google.com> 1527854322 -0700
committer android-build-merger <android-build-merger@google.com> 1527854322 -0700

Merge "Prevent infinite layout while hiding nav bar on keyguard" into pi-dev
am: a41c75d6d0

Change-Id: I947004db70bb1c7da4e23ac6ce33b2c2214bb4bd