tree 2200b4ca5bfd4108ddba683c2cc0f60d1a1c04ce
parent d917fdb4c898bf9f16d14fd3dbfde29a3a4b01b1
parent 786d82979c695de07e0f78b007811c932439add0
author Myles Watson <mylesgw@google.com> 1574728866 -0800
committer android-build-merger <android-build-merger@google.com> 1574728866 -0800

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

Change-Id: I5b4bbb6e141de6641d16c0bfb53bc0b013705847