diff options
| author | Xin Li <delphij@google.com> | 2016-11-09 20:34:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-09 20:34:42 +0000 |
| commit | d167a27c1f0a86e871e3743c4f93a9734493c97a (patch) | |
| tree | 11509652ecc97f0671cbce7945d5ef11da72e260 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12f98789bfaa0b8217614fdf40ef36d3aa67ce19 (diff) | |
| parent | 84a9614947394543719e1beecd6229bc2d9a6970 (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
Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions