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)
commit4ba3b12efb713c21904214ee33e44a711bdca3ff
treedcf0648697834cd9f53cbdd489d3766c66b9c703
parent619ed85e812ff1de47de56cce24cc046cc9caa72
parent31a61f6348b69c4dfc68e95c9a44e428234dd5f6
Merge changes from topic "PPRL.190205.001"

* 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