| commit | f6abf78795a6e0dd64ff7ab9523f639732f188c2 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Feb 20 16:25:58 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 20 16:25:58 2019 +0000 |
| tree | e045c25b9e103fefc785e94406e1225a91aa9df8 | |
| parent | 3b3871c9e595d6f3550bcda837bee63a1a88a77f [diff] | |
| parent | bd97fcd6748c563d74a7700a248c4cb2fbb6cdb0 [diff] |
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