diff options
| author | Bill Yi <byi@google.com> | 2016-06-01 15:56:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 15:56:06 +0000 |
| commit | c77280528d62c321151485641e2fa16fb8449286 (patch) | |
| tree | 169006be14655a8c28a35a77715f4d2c9c5af16b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71bd3f34c39b96967aca7d442254462007f80c5c (diff) | |
| parent | 1f851eed00a20cff2b39fba826e77a70ca0eb8bf (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f9a6f33091 -s ours am: e316fc0577 -s ours
am: 1f851eed00 -s ours
* commit '1f851eed00a20cff2b39fba826e77a70ca0eb8bf':
Import translations. DO NOT MERGE
Change-Id: I7b671e84e25a5f2a7023717da64cf0b3d7003008
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions