OSDN Git Service

Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into...
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 10 Jan 2017 19:12:26 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 19:12:26 +0000 (19:12 +0000)
am: 6688dae166

Change-Id: Ib8004c18bcc9db33c2340f89fc93268e41026c4d


Trivial merge