diff options
| author | Adam Powell <adamp@google.com> | 2016-05-26 02:21:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 02:21:03 +0000 |
| commit | 8c6e691c09d9ab30d6e1aa265c50a1a62e933c22 (patch) | |
| tree | df4acdad25e0934cf1097717f38e522d2a45053e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | edd7088405bddde86139216ab036998091f48691 (diff) | |
| parent | 3579a6a63474918be6d7d3df21bcf132e8dc0e54 (diff) | |
Merge "N is API 24" into nyc-dev am: bc983c4431 am: 0b478d5b05
am: 3579a6a634
* commit '3579a6a63474918be6d7d3df21bcf132e8dc0e54':
N is API 24
Change-Id: I15afe037702682bb124355b8da31af37444ded2b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions