Skip to content
Commit 59adea1e authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Delay loadEscrowData from locksettings" am: 60edeec0 am: cd9d960d am: bc71ae14 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I510b4d6da055157796b75d46981b103f63e7f344
parents bfde98c3 bc71ae14
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