Skip to content
Commit 94143edf authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Fix a deadlock in LockSettingsService" into oc-dev 

am: 00496c40

Change-Id: I112cb14469f644fd38da561e491c580c01a1e7b3
parents 04f57e2d 00496c40
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