[automerger skipped] OOB write in rw_t2t_handle_tlv_detect_rsp am: 975d2564...
[automerger skipped] OOB write in rw_t2t_handle_tlv_detect_rsp am: 975d2564 am: 0968938b am: f4891883 -s ours
am skip reason: Change-Id I44a3f26afb3591d1a94e2e0d7a8b1619beeaa7d6 with SHA-1 5fbc3a88 is in history
Change-Id: I621a9880a7d79ebb3015f93b99601de6dc7893d1