OSDN Git Service

Merge "Don't delete new notification channels not present in backup" into oc-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Fri, 7 Apr 2017 18:28:45 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 18:28:45 +0000 (18:28 +0000)
am: 9394a8fc62

Change-Id: Iae8d9273ede243c9261ace763dc321a6196e302f


Trivial merge