diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:04:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:04:11 +0000 |
| commit | a547d62f787fc19f11447aebbb39bb3a109b9acd (patch) | |
| tree | d51216441031bd8cc13180279d593835fa7287f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5346695e1dffebe8461ef9e2c005e6d595eefea3 (diff) | |
| parent | 2130b287549b010b405bc72d04f07fb1bd070ba5 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 2130b28754 -s ours
* commit '2130b287549b010b405bc72d04f07fb1bd070ba5':
Import translations. DO NOT MERGE
Change-Id: Ieac6c674226e01153395c9cba948b29fc1ba3409
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions