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