Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a716c73 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 

am: be2da62d

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

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
parents d8099c43 be2da62d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment