Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours
am:594180c68c-s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1a0914d81efis in history Change-Id: I457cc035aeba0bfaf3b12bcc0e6460dc62924839
This commit is contained in: