diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:33:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:33:35 +0000 |
| commit | c8f08fd7f7036a94923704211314276bd3a031b4 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7333b0ddeeed5c7531cf270ce1f045f6f4cdb097 (diff) | |
| parent | a27dbcb4a9d7ff8be8ac28016a25ee4bea8a4fa5 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d8a450557e -s ours
am: a27dbcb4a9 -s ours
* commit 'a27dbcb4a9d7ff8be8ac28016a25ee4bea8a4fa5':
Import translations. DO NOT MERGE
Change-Id: I0362623f474ea9eb8d7581e4581226ee1c81bdb3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions