diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:36:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:36:03 +0000 |
| commit | 4a1cee4013b5ee74b85c41d6cc0ee75047144e9e (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1e6abe0a940650a7d30800106c6bbaec654e7e90 (diff) | |
| parent | b48b0bc15310e9a9600f72708052fb36c076ed54 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c -s ours am: 81a108d038 -s ours" into nyc-mr1-dev-plus-aosp
am: b48b0bc153 -s ours
* commit 'b48b0bc15310e9a9600f72708052fb36c076ed54':
Import translations. DO NOT MERGE
Change-Id: I6ce6dad906a398ec59844be5ac452bd04773946b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions