diff options
| author | Chalard Jean <jchalard@google.com> | 2019-05-28 07:57:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-28 07:57:29 -0700 |
| commit | 44831089fa9c095e21841ca5e11ee4edab4b9cc4 (patch) | |
| tree | 2eff8c95443dd486d647e1e8384aced20d44058d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d442e8793671965bd038c5ea15595c3e4df26e9b (diff) | |
| parent | 28fdeebaf8bb3be5cacd13198bf29776bfa8fb54 (diff) | |
[automerger skipped] Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." into qt-dev am: d0ee254855 am: 9adfabc792 -s ours
am: 28fdeebaf8 -s ours
am skip reason: change_id I74cf5f0fa17fcf818f1fed78c7e3e4375c20152e with SHA1 506686bc3d is in history
Change-Id: I3cdb9b726e98880a29e8359ddd111f64c3fac704
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions