diff options
| author | Chalard Jean <jchalard@google.com> | 2019-05-28 08:04:22 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-28 08:04:22 -0700 |
| commit | 5592306ad5892d0cb7c8047c2aa75ec04bfaca06 (patch) | |
| tree | 2eff8c95443dd486d647e1e8384aced20d44058d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d9c39e297af34f958f9f5b794a934090f7a68fcd (diff) | |
| parent | 7d702e6587dafae615ec09c4c299d1eb5b1c8492 (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: 7d702e6587 -s ours
am skip reason: change_id I74cf5f0fa17fcf818f1fed78c7e3e4375c20152e with SHA1 506686bc3d is in history
Change-Id: I427488b5e0d805dab2f9c190ea99554b8eefd4d1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions