diff options
| author | Pengquan Meng <mpq@google.com> | 2019-03-20 12:02:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-20 12:02:24 -0700 |
| commit | e594b99e1d7e4c3d6b666d7fca2c1278f712589d (patch) | |
| tree | bbe76074cc51855145105311a387e4c997c5f139 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ad5ddfc336fe067f88529edb89b8bc67ce96eb1 (diff) | |
| parent | a70d308d65fde8dab946b439d0d21339981d7fb2 (diff) | |
[automerger skipped] Merge "[API feedback] fixed API for NR" am: 7afba9e583 am: ffddf67508
am: a70d308d65 -s ours
am skip reason: change_id I133075a3688c3fa7550c8a2f43bc13d8b25999b2 with SHA1 ae718f9e56 is in history
Change-Id: Ib269077200926158c639506983ae446a02e55435
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions