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)
commit0271fbdaf9ad1154d0756815ad15918faee32755
treec08589f2b81a0a20ed079f46a174fc3288aeade9
parentfeb6cf4aa16cf5fa063f7058cfcdf91ad9a623ac
parent9394a8fc62817a34b85d91c0004c924166952936
Merge "Don't delete new notification channels not present in backup" into oc-dev
am: 9394a8fc62

Change-Id: Iae8d9273ede243c9261ace763dc321a6196e302f