tree 923653b3bc278c0e8eb96b760ca5e092a84eceab
parent 23cf4aa51aab1474692ef224e3671af976c2612e
parent 6637d85f4a1cebdac219346258bfc0ad8f2f3a7c
author Ivan Lozano <ivanlozano@google.com> 1514487590 +0000
committer android-build-merger <android-build-merger@google.com> 1514487590 +0000

Merge "Disable sanitizer entirely in ResourceTypes.cpp" am: f7c56624c7 am: 203055b322
am: 6637d85f4a  -s ours

Change-Id: I46acecdf92bc1245db338ce9f7f06fdf12385bdf