tree 8df2306d1a5a7b00afe2ed175b2525abc003e5c4
parent b5ba4b1fd23f5559e2f2afacb6cba3f37b0ae8f6
parent 25329fa14fb1d50dc9eb8982ea8efa1c0bbc481b
author Julia Reynolds <juliacr@google.com> 1496260929 +0000
committer android-build-merger <android-build-merger@google.com> 1496260929 +0000

Merge "Don't verify secondary setting on restore" into oc-dev
am: 25329fa14f

Change-Id: I674c7da780afba0974e4ffe3f53d31bca665fdf0