diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:22:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:22:25 +0000 |
| commit | 9c8adbb99981ecbe0368b12cbf449d9729c5c5cd (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0b3b15456444a1c73798a53d539250680b340de4 (diff) | |
| parent | 1400ea56b0d935803df6f10193114c37bd4a3dcb (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours am: 5c2575071e -s ours
am: 1400ea56b0 -s ours
* commit '1400ea56b0d935803df6f10193114c37bd4a3dcb':
Import translations. DO NOT MERGE
Change-Id: I6a05713c87dc9b8b87891d99f126705aaa69c31e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions