diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:31:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:31:50 +0000 |
| commit | 3e598ff5e1294276d5d6efdbee2bf706e318d547 (patch) | |
| tree | 277720002bc21c9948a2146196c64f5c66b4d49a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4a786994bc87957a2b25baae9e8c1c5d89d87273 (diff) | |
| parent | a547d62f787fc19f11447aebbb39bb3a109b9acd (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2130b28754 -s ours
am: a547d62f78 -s ours
* commit 'a547d62f787fc19f11447aebbb39bb3a109b9acd':
Change-Id: I3b9530bc3afbbe5a45ac406214534c7b7fe2f1a7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
