tree 6af55f71d264c060aab076fe2c5e214c6c7af1f1
parent 0b9451416be35cd87417cdf3fcbf0f5aba6ae6b4
parent f2764ed4d53e7ffa9e32dc694c5121cdd75992d3
author Lucas Dupin <dupin@google.com> 1501132892 +0000
committer android-build-merger <android-build-merger@google.com> 1501132892 +0000

Merge "Fix window insets on keyguard" into oc-dr1-dev am: 6462fe4b95 am: 7ef9f224e4
am: f2764ed4d5

Change-Id: Icec2c9dc4580d35947cf5f1831caa064e6007687