tree bd0b7c61f5368be3a016c03c020f2f2354ce1e31
parent 4254ac017240c201323964864f88fb3823b32f6c
parent e542499a304f067372d85722e11a74b4e56b0bd7
author Adrian Roos <roosa@google.com> 1415659053 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415659056 +0000

Merge "Add LockSettingsStorage tests" into lmp-mr1-dev