Commit 66f7524b authored by George Chang's avatar George Chang Committed by android-build-merger
Browse files

[automerger skipped] Merge "Prevent OOB write in... 

[automerger skipped] Merge "Prevent OOB write in nfc_ncif_proc_ee_discover_req" into oc-dev am: a9a4144f am: 4bef118e am: cd62d7c1 -s ours
am: 7e2598f7 -s ours
am skip reason: change_id I127fe1445b79d7f00cf4835961a83ed5410722d8 with SHA1 499e39c0 is in history

Change-Id: I68e20f89b9d1c6e193c2070ba7726a818e3c0756
parents d96d3aae 7e2598f7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment