am e69eaf5c: Merge "Don\'t log BlockGuard violations on ENG builds."
am e69eaf5c: Merge "Don\'t log BlockGuard violations on ENG builds."

* commit 'e69eaf5c6de95a0db7d5cddf079169a925bac85f':
  Don't log BlockGuard violations on ENG builds.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base