diff options
| author | Chalard Jean <jchalard@google.com> | 2019-05-28 07:59:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-28 07:59:24 -0700 |
| commit | 7d702e6587dafae615ec09c4c299d1eb5b1c8492 (patch) | |
| tree | 0d035fef49255b7cc6824a894eaf22cdbf814582 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7e447f127a05bc8a4d1dc617b5aa26c25bbca510 (diff) | |
| parent | 236e61d618aeb3d2caa495c15568179d86206bf0 (diff) | |
[automerger skipped] Merge "Let the system server have CONNECTIVITY_USE_RESTRICTED_NETWORKS." into qt-dev am: d0ee254855 -s ours
am: 236e61d618 -s ours
am skip reason: change_id I74cf5f0fa17fcf818f1fed78c7e3e4375c20152e with SHA1 506686bc3d is in history
Change-Id: I422cb4e44af1a10fb4582a61fd76139fc78f54db
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions