OSDN Git Service

[automerger skipped] Merge "Ensure Notification re-post with setOnlyAlertOnce(true...
authorTyler Gunn <tgunn@google.com>
Tue, 17 Jul 2018 22:16:41 +0000 (15:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jul 2018 22:16:41 +0000 (15:16 -0700)
am: bbe8990162  -s ours

Change-Id: Ic8cd7c12d58d9f75b1d952a7e9fca6cbe3f8fb33


Trivial merge