tree 49f8771c989076106aee5ddc4a2b2c979484c650
parent 8b4e7617f7f951ed1880ece4ee874377a04a4cc9
parent 551e4408a8d741ebf880c105d2b07d57ce739125
author George Chang <georgekgchang@google.com> 1559813337 -0700
committer android-build-merger <android-build-merger@google.com> 1559813337 -0700

[automerger skipped] Merge "Prevent OOB write in Mfc_Transceive" into oc-dev am: f6cec4f9b7 am: e67d9d1fde am: b2cdfcd2e6 -s ours am: 257f2336d1 -s ours
am: 551e4408a8 -s ours
am skip reason: change_id I3e1977514ba924655d42be4782244c6ef1cf7619 with SHA1 130a144ee6 is in history

Change-Id: Ic4e8bbfcac3ae8ac79afaf757b69c6e942b3ca71