Merge \\\\"Settings: add logpersist kernel only selection (strings)\\\\" am: fd021e203d
-s ours am: a79d854fb6
am: f8da6eca1c
am: 9d14c80468
Change-Id: I93977f20bc35487a86fc74ab8c130f921726ede7
This commit is contained in: