tree fdbf5608a6ef38762f8a5d5acd39fe85290989c6
parent 6da5627b3e4564948e89814cbc792a61e23090e2
parent 3b826c6075b12915ef3e0e1fdd83c62dd10e4f2e
author Bookatz <bookatz@google.com> 1522466978 +0000
committer android-build-merger <android-build-merger@google.com> 1522466978 +0000

Merge "Statsd MAX now obeys refractory periods too" into pi-dev
am: 3b826c6075

Change-Id: I5741106ec3cd5a5d9c7a66796549982936c4f500