OSDN Git Service

Merge "Limit the number of notis an app can enqueue" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Jul 2017 17:06:23 +0000 (17:06 +0000)
am: c65071d625

Change-Id: I85e7117a88be1a629a953f1c721faba508d6d424


Trivial merge