tree dbbb6e74654ae4059bfd13c6d173649b546eba3c
parent b3b191e340f66b79dcacbbccc9ad9df4c5923c3b
parent 6fb15ea9d4d95cdb66a79764f38ec658f0053cc0
author Joe Onorato <joeo@google.com> 1496193955 +0000
committer android-build-merger <android-build-merger@google.com> 1496193955 +0000

Merge "Turn off logspam" into oc-dev
am: 6fb15ea9d4

Change-Id: I975c93d9f110a8a1488e366180da727ad9ec6408