[automerger skipped] Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev

Browse Source

am: 31a61f6348 -s ours
am skip reason: change_id I421c7487955ee339f88e3957c973375d0f87e2ff with SHA1 95bd7221f6 is in history

Change-Id: I76722b24202892034148a1c1030b8ca4d3417797

...

This commit is contained in:

Raman Tenneti

2019-02-20 08:48:13 -08:00

committed by android-build-merger

parent 818e8c1bf2 31a61f6348

commit f43dd2bd13

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available