Merge \\\"Settings: add logpersist selection (strings)\\\" am: 99afd4a87d
am: 540ebc39ac
-s ours
am: 1f9e0cce2b
Change-Id: I146e9e96a7c076528cf7d1da419ff79e2cba9ef6
This commit is contained in: