diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:13:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:13:12 +0000 |
| commit | 065a39e95dd8a2ec5cb373ce47e80042e8e032a3 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 85321c912e535401319252b2826a2183fa9f9050 (diff) | |
| parent | 7ef5df0ba45067cb0db32e710e4f541502486546 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c31029409a -s ours
am: 7ef5df0ba4 -s ours
* commit '7ef5df0ba45067cb0db32e710e4f541502486546':
Import translations. DO NOT MERGE
Change-Id: Ibbabcc3c4f7624270838b594c6b2b838bfed3ca5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions