diff options
| author | Xin Li <delphij@google.com> | 2019-02-20 16:25:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-20 16:25:58 +0000 |
| commit | 4ba3b12efb713c21904214ee33e44a711bdca3ff (patch) | |
| tree | dcf0648697834cd9f53cbdd489d3766c66b9c703 /rs/java/android/renderscript/Program.java | |
| parent | 619ed85e812ff1de47de56cce24cc046cc9caa72 (diff) | |
| parent | 31a61f6348b69c4dfc68e95c9a44e428234dd5f6 (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
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions