tree 13190dd054251cade784f7e8cb8fee628a5af3bf
parent fcec01f0402c3eb9ef36bb0434317008b30d07ae
parent 6491b034105d57c379b52f23f76e575dbf9d30dd
author Benedict Wong <benedictwong@google.com> 1510164745 +0000
committer android-build-merger <android-build-merger@google.com> 1510164745 +0000

Merge "Update documentation for AES-GCM-ESP keymat length" am: 3db35dfcd5
am: 6491b03410

Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab