diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-06-27 10:35:37 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-27 10:35:37 -0700 |
| commit | 3b2d2587599ae38d045fac160cb7b1506002812c (patch) | |
| tree | c141997ac1f9248a6a0e6ccc143f44316cb23c0b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2b1c378f0c0e4e2bb2de22fa6edf8f7331cacd31 (diff) | |
| parent | 64cb971b9da8f54d46363cd8a42825e9bcbc33cb (diff) | |
[automerger skipped] Merge "Only show "Connected" note after opening portal" into qt-dev am: 09a8de5530 am: 1eaf39d7b7 -s ours
am: 64cb971b9d -s ours
am skip reason: change_id I99be7d312d020d242081971c7e522023bbbab072 with SHA1 0b5a4d8621 is in history
Change-Id: Id475694f1f99eb5067b1763ee7a8632f7d1e41b3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions