OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte...
authorRich Cannings <richc@google.com>
Thu, 4 Apr 2019 07:17:57 +0000 (00:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Apr 2019 07:17:57 +0000 (00:17 -0700)
am: 5d9189fab2 -s ours
am skip reason: subject contains skip directive

Change-Id: Id431f40576a5375d541b4b41d2880ac0c9ac7519


Trivial merge