OSDN Git Service

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

Change-Id: I6871f8ddc5ee697bc0fa3251c6b36f6cc27e2653


Trivial merge