diff options
| author | Julia Reynolds <juliacr@google.com> | 2016-04-26 16:16:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-26 16:16:09 +0000 |
| commit | d33451c8378590e4fca82ac11fcf122ccc5f2a84 (patch) | |
| tree | 6312be963d1a534bab58fe73ef041ad769e1af19 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b6f2b9de07c965fbe56f6c7f9e9858180f86cc2 (diff) | |
| parent | d9c4c7650f4ee6ea3282cc097d1d0f0756d32c69 (diff) | |
Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: a6c9a89
am: d9c4c76
* commit 'd9c4c7650f4ee6ea3282cc097d1d0f0756d32c69':
Api review: Settings.
Reduce spacing.
Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions