tree d62b4df5799d2c170be1019f31e6c31b83adb715
parent dbb33c058b13cca8b4ba916bac9a4bd08d0ddcc4
parent 9282193c8408f392e7a3b9660390afa2194f023b
author David Stevens <stevensd@google.com> 1505866706 +0000
committer android-build-merger <android-build-merger@google.com> 1505866706 +0000

Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev
am: 9282193c84

Change-Id: Idbd4d3f24dffaad11518dd3d4d16ca7c7137ee94