diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:50:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:50:09 +0000 |
| commit | 3b6ea27f9d83dc237ed1b1cccd5a7604eaab9c06 (patch) | |
| tree | 56d3ef20aab2fa3ce7b547cfd89fc0ce0e10501f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 339684c2710d1bbe554e6eb48328e2e23b8eb738 (diff) | |
| parent | e235b490de7d0102bae20938bbc3de838d97a969 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a4bfd03cd5 -s ours
am: e235b490de -s ours
* commit 'e235b490de7d0102bae20938bbc3de838d97a969':
Change-Id: I3ac4c637c192a7a019b8170993b5469f2636fdb4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions