tree 36f58dc60e15aa82830170ed427c8e10c2503634
parent 754b56690be41fe38fcb502da2eb0d8ec4d19200
parent 4f6f7c865f25f478e5198031d419b498bdeb7ffa
author Jim Miller <jaggies@google.com> 1426809793 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1426809794 +0000

Merge "FingerprintSettings improvements"