tree 3382e973af922d54bad222ac84acad2ce62fdcc5
parent f92b2773d3cebd6c56735f405bd5e577613c5a58
parent 73dc479ab5fbb66e31343c043ebf350c251d79f5
author TreeHugger Robot <treehugger-gerrit@google.com> 1517268309 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1517268309 +0000

Merge "Remove security settings v1 code"