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