Skip to content
Commit 4e8aca66 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "CtsWindowManagerDeviceTestCases... 

[automerger skipped] Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" am: d0790027 am: d6775e2d am: 6fc25007 am: 2dbefde9 -s ours am: 12341005 -s ours

am skip reason: Merged-In Ia0a52477fc62b403c678301c8e49561d3b23bedf with SHA-1 c582b3c2 is already in history

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



Change-Id: I7594b0eb320e54b54d4ba7befdafcfc06b6f578b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6ad64f16 12341005
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