| commit | 3a716c735b40280f8f585738bafb22aac96607de | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Jun 02 16:48:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 02 16:48:13 2016 +0000 |
| tree | 790f9d8bfdb8e1c866d5108f5f0c98bbf11963db | |
| parent | d8099c4329a4fb62446cad381fd34243748f9952 [diff] | |
| parent | be2da62d11227c564817906c5df0ceb151ed2436 [diff] |
resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01 am: be2da62d11 * commit 'be2da62d11227c564817906c5df0ceb151ed2436': make the notification enqueue rate threshold a setting Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed