tree ab5f55c3d23f73403495c63d23ff55c555a647bf
parent 1580c9f0fdf6f36372e1f700683df5e6ecd74d2c
parent 576271755bec1bc9dd8102f7d1653a3c1ada5a9f
author George Burgess IV <gbiv@google.com> 1558678065 -0700
committer android-build-merger <android-build-merger@google.com> 1558678065 -0700

Merge "fortify: use __builtin_constant_p for more short-circuits" am: 30d4c6fb06
am: 576271755b

Change-Id: Ied86e65babdba986769bf7bf82606cb9f4975e41