tree 4e263b1806d10e9066e281514efefcfe38e12a2f
parent 477fa7be416ad0eac48648ae62874afd23506d2a
parent c58de01f777c1adde01a6fcd768039c1b41a0c0f
author Lucas Dupin <dupin@google.com> 1503456803 +0000
committer android-build-merger <android-build-merger@google.com> 1503456803 +0000

Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev am: f00b496b4d
am: c58de01f77

Change-Id: I91c715d8663833f10d829dc7feee963319ccc627