diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:04:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:04:02 +0000 |
| commit | 337c1b110856328476341b405c31accacf6d48b2 (patch) | |
| tree | d51216441031bd8cc13180279d593835fa7287f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12d1f5d5c0d9c1fbff66bd838c5d534893fba686 (diff) | |
| parent | cace07e7271723232277e8dfe94799c80926c5ea (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: cace07e727 -s ours
* commit 'cace07e7271723232277e8dfe94799c80926c5ea':
Import translations. DO NOT MERGE
Change-Id: Ib82f00c78c2e08d1d79430198f7cb505f2b2e334
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions