Skip to content
Commit e6cbb2d6 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am:... 

Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b4 am: c7888d87

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476108

Change-Id: Ic4477f17b1712d13fb333229cf2431ebed00cb3f
parents 3901dc49 c7888d87
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