diff options
| author | Adam Powell <adamp@google.com> | 2016-05-26 01:22:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 01:22:00 +0000 |
| commit | 0b478d5b052c4440a0eb8686d400d1595ead1857 (patch) | |
| tree | 9d4e2f0cd03b2626339db519f984d6242a95fa55 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3d09accb9db26eae36a1e3bab415c469a4bbd3c4 (diff) | |
| parent | bc983c443139c7b4605f98d56bd9ad7652a9938b (diff) | |
Merge "N is API 24" into nyc-dev
am: bc983c4431
* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
N is API 24
Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions