OSDN Git Service

[automerger skipped] Fix merge problems with cherry-picking "Add notification setting...
authorRaman Tenneti <rtenneti@google.com>
Wed, 20 Feb 2019 16:48:13 +0000 (08:48 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Feb 2019 16:48:13 +0000 (08:48 -0800)
commitf43dd2bd1300437dcd354372be27bc6938eab8fb
tree4863b6e214a83175cdb87a16cc62ba87de37900e
parent818e8c1bf29b8de06f537274baadf0e2fb206150
parent31a61f6348b69c4dfc68e95c9a44e428234dd5f6
[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
am: 31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: I76722b24202892034148a1c1030b8ca4d3417797