diff options
| author | Adam Powell <adamp@google.com> | 2016-05-26 01:59:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 01:59:49 +0000 |
| commit | 823c877d016e77a14297110c94f7f832a38859dc (patch) | |
| tree | 2ca4376607c103fcd7a7aa4f7f15634e9171ff9c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 75b84a9355feb5719fbb53e5ffcdbc216cdada63 (diff) | |
| parent | 528a5bd466a18f2d955ae364b0e8600b74fa790f (diff) | |
Merge "N is API 24" into nyc-dev am: bc983c4431
am: 528a5bd466
* commit '528a5bd466a18f2d955ae364b0e8600b74fa790f':
N is API 24
Change-Id: I3f3e4c597924bc5b5f47c3c029ee52e147c61b34
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions