diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:42 +0000 |
| commit | 536351ebbd2b02255649d2b801f884e3b4ed1e64 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1400ea56b0d935803df6f10193114c37bd4a3dcb (diff) | |
| parent | c29b39b95f545e4c585d67fed17e3c59f3ef901a (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours
am: c29b39b95f -s ours
* commit 'c29b39b95f545e4c585d67fed17e3c59f3ef901a':
Import translations. DO NOT MERGE
Change-Id: I7ada5df98e9d67b7991e73000c5c8cc885a8ff71
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions