diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 22:55:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-12 22:55:36 +0000 |
| commit | ef2200b981ce2ad517cb4481da9c5010744210c0 (patch) | |
| tree | 4c8bdf9e51b38932924972acf3a80dbfe0df6c96 /rs/java/android/renderscript/Program.java | |
| parent | 05bc7cc4a1e20d5e4fcb4d2c685910577007851c (diff) | |
| parent | f0cb74314b045c39d631c3e2511dab821fba50e5 (diff) | |
[automerger skipped] Merge "Check screenlock for unlock dialog" into qt-qpr1-dev am: 4a03ca6ad1 am: f0cb74314b -s ours
am skip reason: Change-Id I08c7aa677150ca950785428580eee6a39ffadd37 with SHA-1 3b7cddc107 is in history
Change-Id: I238b9890835cad4c5be34849f06644442d001115
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions