diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:33:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:33:02 +0000 |
| commit | 998797a27d026a0b79dc1fd1fcb6004a35799228 (patch) | |
| tree | 074c46a2df891fd4260fcf8a720a9128810b99d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9269e2272bea8b4c6ca80c3e20872de75dd4c876 (diff) | |
| parent | 072150db89de9fda26bd2150242ab31f9309ec70 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 072150db89 -s ours
* commit '072150db89de9fda26bd2150242ab31f9309ec70':
Import translations. DO NOT MERGE
Change-Id: I7c97e2bfe59959e888e22cf8b3304a51aee0a0c9
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions