diff options
| author | Bill Yi <byi@google.com> | 2016-05-26 17:37:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 17:37:41 +0000 |
| commit | 8272bb6af49a6ce8803e54c92fe63a095bb23a24 (patch) | |
| tree | 8848644f5325c4a58ec73237c8be9cc4c1b5b0a2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 901bdeadef9c293c093e7902b414734b9c63ac2c (diff) | |
| parent | cb8c569414121158adb2a627d4a91b47dd3c4362 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cb8c569414 -s ours
* commit 'cb8c569414121158adb2a627d4a91b47dd3c4362':
Import translations. DO NOT MERGE
Change-Id: I200d13ae1563e54f4c93413395e4f5d8823f7fcc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions