OSDN Git Service

Merge \\\"Settings: add logpersist selection (strings)\\\" am: 99afd4a87d am: 540ebc3...
authorMark Salyzyn <salyzyn@google.com>
Thu, 9 Jun 2016 20:23:05 +0000 (20:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Jun 2016 20:23:05 +0000 (20:23 +0000)
commit7bc9c6d7c43aa2ff5ca70da077ba106a6e85bc52
tree0b261f38075d22859eb556dc124d4c51e8fe84d5
parenta58c30a2f364ac122b8895775eae4c26fb5f7109
parent1f9e0cce2bc18a1819c59d85d28ac4e4a8a8ffa6
Merge \\\"Settings: add logpersist selection (strings)\\\" am: 99afd4a87d am: 540ebc39ac  -s ours
am: 1f9e0cce2b

Change-Id: I146e9e96a7c076528cf7d1da419ff79e2cba9ef6