diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 20:17:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 20:17:00 +0000 |
| commit | 63c9a312a25b435e892cb1909098806b4c55cc67 (patch) | |
| tree | dfa9d4aa368d2bed8ec147f4380a2a4b74242a02 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0a23c1a99542f38a32dd512bb313af6609f2a726 (diff) | |
| parent | 6166af96ba9bbb07865ad550e5be700d42b143bb (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours
am: 6166af96ba
Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions