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