diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2016-09-12 19:34:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-12 19:34:56 +0000 |
commit | d28f5d5e5ada23cb8166916d0c2fe3c792775ffd (patch) | |
tree | c3ea833a8e4beff3d613bd3c0d98819df94448ff /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ca7e0609452c8e9a78442def4c5e19c2312286d9 (diff) | |
parent | def3c209dbaed68e787bae76fa23f5c0a39d250c (diff) |
Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev am: e93c655093 -s ours
am: def3c209db -s ours
Change-Id: Iab2a96adb127673a01e2cba872c34825c72e8a69
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions