diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 21:36:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 21:36:34 +0000 |
| commit | aa437b194b9675d02ff143d6025190281eeafa24 (patch) | |
| tree | 55c4a987b41d31cfc773eac8a4325e4de9a7eb93 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 434ac05eba19b36470e9d5d648ea8c93d17e1c64 (diff) | |
| parent | a732c6925752be9d7909a3e1d3f6aa2dfc6a106a (diff) | |
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520 am: 4c1922b441 am: ba293f3c28 am: a009932a57
am: a732c69257 -s ours
Change-Id: Icbc86a35dd1b368e4796550be2280e08b17d5eb8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions