diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:12:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:12:25 +0000 |
| commit | e577b65d57f518c0b0f6e89e52afde6ba9dae4af (patch) | |
| tree | 3f7529d6452f80d957ea5996e34e2f1ee397ee44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 103104dc9b8c2b442ff2a98e569368228be609cd (diff) | |
| parent | 16dd875f8a7c29d5d8093b545b1c84c071067674 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740de -s ours" into nyc-mr1-dev-plus-aosp
am: 16dd875f8a -s ours
* commit '16dd875f8a7c29d5d8093b545b1c84c071067674':
Import translations. DO NOT MERGE
Change-Id: I0b7186cfc4c89ab730fd60e6ea41064a51d0968b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions