diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:05:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:05:11 +0000 |
| commit | 7ef5df0ba45067cb0db32e710e4f541502486546 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05b2250d541e3cb057af9eb45b964f60c2a08900 (diff) | |
| parent | c31029409ada1e0c4a914b26e64cd0ac0820a323 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c31029409a -s ours
* commit 'c31029409ada1e0c4a914b26e64cd0ac0820a323':
Import translations. DO NOT MERGE
Change-Id: I72a678ae2aa88ee246fbc5ed276fdcd3d52eaa33
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions