Skip to content
Commit 832d4bea authored by Kenny Root's avatar Kenny Root Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert LockSettingsService tests to JUnit4" am:... 

[automerger skipped] Merge "Convert LockSettingsService tests to JUnit4" am: 78056c77 am: cec994c0
am: 85d17d0a -s ours
am skip reason: change_id Iaf280718d4c28966b60c76dda90a4674a24f26c6 with SHA1 e7178a23 is in history

Change-Id: Ib44a48cd6d4a9e84a70859f8ddc8eec9a0665710
parents ca0a066c 85d17d0a
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