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