| commit | be2da62d11227c564817906c5df0ceb151ed2436 | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Jun 02 16:41:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 02 16:41:30 2016 +0000 |
| tree | 9edfb38ba9a8c0b72398025678405bc387864907 | |
| parent | 9b14b62f5dd01498198bab2c76532cca3e1ef1ed [diff] | |
| parent | d958f83a017dde230203d91c8daedf36d40c22a6 [diff] |
resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01 * commit 'd958f83a017dde230203d91c8daedf36d40c22a6': make the notification enqueue rate threshold a setting Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334