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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ea608a47dc07a2cd96b5c6d1e9dfd4c42f366df
parents 9112917e cd9d960d
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