tree d7d9ed2e5ebba58b58a3e589e78bd282807abb53
parent 8474b608a77560ecc68dac83f0e7dc3d6ba4d821
parent 018f5534fa78ac1e297ae4b38c4e9a06e94c78ee
author Ruslan Tkhakokhov <rthakohov@google.com> 1579199628 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1579199628 +0000

Merge changes from topic "overrideable-by-restore"

* changes:
  Add Settings.(System/Secure).putStringOverrideableByRestore
  Add preserveValueInRestore flag to Setting object