diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:02:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-19 00:02:18 +0000 |
| commit | d2d7462eb3d6b7d1b6bcc2dd7b663fc3bd6529a3 (patch) | |
| tree | c0cf9cd427cc6a8c7b80d2319d5d5d93986887c1 /rs/java/android/renderscript/ProgramFragment.java | |
| parent | 0d2e2c2be0374fdf426212368ab2e593612bf151 (diff) | |
| parent | ad4458c2bd8e3494d4461a76b851f6477e8736db (diff) | |
[automerger skipped] Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev am: 1308ffccf7 am: ad4458c2bd -s ours
am skip reason: Change-Id I44c80a08e541503c1f910c4410fbcce3dd05a24e with SHA-1 1e713c1eab is in history
Change-Id: I66cfb67dfdb89310dbf6ef2d2e62a43905578a4f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions