Skip to content
Commit be2da62d authored by Chris Wren's avatar Chris Wren Committed by android-build-merger
Browse files

resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev 

am: d958f83a

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

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
parents 9b14b62f d958f83a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment