tree 9edfb38ba9a8c0b72398025678405bc387864907
parent 9b14b62f5dd01498198bab2c76532cca3e1ef1ed
parent d958f83a017dde230203d91c8daedf36d40c22a6
author Chris Wren <cwren@android.com> 1464885690 +0000
committer android-build-merger <android-build-merger@google.com> 1464885690 +0000

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
am: d958f83a01

* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
  make the notification enqueue rate threshold a setting

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334