Skip to content
Commit 3e5a0605 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

Merge changes Ief1cac19,Ibc9236a1 into rvc-dev 

* changes:
  Resume-on-Reboot: add storage for armed status
  LockSettingsService: move database storage
parents ae5a3ee6 ea134edc
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