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