tree e22176f49411ca11ba6bd30e739831e16f75f3ec
parent 6308b0a79797dc0b9ab97f6c5711b243a85a1fa0
parent d60112651c91c29e2809e0c3ce7df63f7f195746
author Amith Yamasani <yamasani@google.com> 1466217142 +0000
committer android-build-merger <android-build-merger@google.com> 1466217142 +0000

Merge \\"Clean up ex-users in lock settings db\\" into nyc-dev am: 8cbe1a6309
am: d60112651c

Change-Id: I461d08bcbe5d92279386d9e059859af8488bb3b1