tree f2735e643c931dc2ecf17943a66b911827c29c7e
parent 78552ec9f2aa8914f031600848d760d34dbfd419
parent 78a5f133d1cd0c5c110d25af3d2ee1214c943920
author Myles Watson <mylesgw@google.com> 1574728306 -0800
committer android-build-merger <android-build-merger@google.com> 1574728306 -0800

Merge "Rootcanal: Set default encryption key size" am: e6b599c923
am: 78a5f133d1

Change-Id: I1f71c69c18354df6f40d5a38d41b2b32d9c7bce3