Merge "Merge "Can now indicate the desired number of notifications...
Merge "Merge "Can now indicate the desired number of notifications (sub-buffers)" into nyc-dev am: d0389b87 am: b6389d45" into nyc-mr1-dev-plus-aosp
am: 88a5c1aa
* commit '88a5c1aa':
Change-Id: I6700b10c6cab88d2c1aac01b98dbbd49d50bbfbc