tree f702f29b5e7ca3f9b028d0504e3b1fc757dccdd1
parent 358edf570c373b1016644816a580f4a952d1c104
parent 14d5c12ed6d4febc054c49d6b48e3e3a94d3530d
author George Burgess IV <gbiv@google.com> 1569024616 -0700
committer android-build-merger <android-build-merger@google.com> 1569024616 -0700

Merge "fortify: remove `pragma diagnostic error` from tests"
am: 14d5c12ed6

Change-Id: I98b676f22c717c2ad4e2fdb8911bc6d6a5843cfe