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:22:42 +0000 (00:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Apr 2019 07:22:42 +0000 (00:22 -0700)
commit5f6ddccee6ad60f17530330aad3cab4dfba17179
treed10c7bae038fc564f4a57e3aead8967d8f2f90fd
parent1b13f7d5dbb319b5ba659f1b0208d9568e0d31e3
parent726b90f1672b6d873b5fcfa80df3d3a832eb1b18
[automerger skipped] Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev am: 157f05eb04 -s ours
am: 726b90f167

Change-Id: I4cb8f0000b765ce9b241ecda5d64c852ab547ee8