tree f702f29b5e7ca3f9b028d0504e3b1fc757dccdd1
parent ba7f73fe2c74760a72e867ad0bca1b4e3e3e0abf
parent c03f1e56867feaea2b1615c1f783d0966d2d06d1
author George Burgess IV <gbiv@google.com> 1569025758 -0700
committer android-build-merger <android-build-merger@google.com> 1569025758 -0700

Merge "fortify: remove `pragma diagnostic error` from tests" am: 14d5c12ed6 am: 3d987e9042 am: a38e4b907e
am: c03f1e5686

Change-Id: I972974daf7b979b3270b733c2fb98c5f2901fb94