diff options
| author | Songchun Fan <schfan@google.com> | 2019-12-06 00:24:49 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-06 00:24:49 -0800 |
| commit | 4d475935add4ab9519563fcc082688ff99015d0d (patch) | |
| tree | 6534c9ed1052149729a0ed3e1d369992cfdf3013 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae451813cc826f5c097f761c1f616092e505e641 (diff) | |
| parent | e63063585ccc03430173f1c0d37483c300ba541a (diff) | |
[automerger skipped] Merge "[incremental] parcelable for incfs file descriptors" am: c8b066091e am: c93841a265
am: e63063585c -s ours
am skip reason: change_id Ifc3a43633356951b239486d66ee80d120bc4ab76 with SHA1 0037c3fef2 is in history
Change-Id: I85e820abbfd5189bca23a6ba63c1354a61286a1c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions