diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-14 12:21:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-14 12:21:48 +0000 |
| commit | 70c36466ca586603a70e73e4d9aa05d33e44b06b (patch) | |
| tree | ce77a4688d19988b5371aca8fe01f4eea356ec06 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b0ffbfbd021daea8c79ee4cc4fe8830cda8abb9 (diff) | |
| parent | 25f967a8a2080f23ee1e65edf8629b139611680c (diff) | |
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: bb8b32262f -s ours am: 960a0a8fec -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions