diff options
| author | Bill Yi <byi@google.com> | 2016-05-31 04:25:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 04:25:18 +0000 |
| commit | 9bd9985451e886a183ff8525cff4bc71c1ba4a67 (patch) | |
| tree | d7f31fa72d5e6ecdb54af0228075f98b207c1ad3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f18c7a87901efdc963d951e6b1481b1c98769c3 (diff) | |
| parent | 0a2900a5265bdd9b8535d845488fb7ec3e419f3a (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 52364d9fc4 -s ours
am: 0a2900a526 -s ours
* commit '0a2900a5265bdd9b8535d845488fb7ec3e419f3a':
Import translations. DO NOT MERGE
Change-Id: I62a29dfc789075823751fcc4a16795ef27b6ea1f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions