OSDN Git Service

Merge changes from topic "PPRL.190205.001"
authorXin Li <delphij@google.com>
Wed, 20 Feb 2019 16:25:58 +0000 (16:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 20 Feb 2019 16:25:58 +0000 (16:25 +0000)
* changes:
  Fix merge problems with cherry-picking "Add notification settings to backup&restore" change into pi-dev
  DO NOT MERGE - Merge PPRL.190205.001 into master


Trivial merge