diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-06-26 01:15:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-26 01:15:05 -0700 |
| commit | ca4a7afaadfa66b24ba4e10cddb33f973d4e2207 (patch) | |
| tree | b37775c349e6607c905c8d318c09fed2fab98dbf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 64cb971b9da8f54d46363cd8a42825e9bcbc33cb (diff) | |
| parent | 9cf034331c84ef3b030dcab1987156609a7fab29 (diff) | |
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 -s ours
am: 9cf034331c -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 0b5a4d8621 is in history
Change-Id: I8ec96985154e8fedc64f6f9233930f2d1a9ee581
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions