tree 8a4bda10916ab95210c6938d4b69f9bd4038b000
parent acf866f5b3b92fec5ce40f09b7d2417d1bc150eb
parent ef3cafe15faf2b295059b1c2784f8b88998d46ff
author Ficus Kirkpatrick <ficus@android.com> 1440672727 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672727 +0000

am ef3cafe1: (-s ours) am 2bffbe7e: Merge "Stop logging slow requests outside of debug logs."

* commit 'ef3cafe15faf2b295059b1c2784f8b88998d46ff':