diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:15:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:15:27 +0000 |
| commit | bb7813a8a97d10baa4fcd980d488a135b5bcc491 (patch) | |
| tree | 3f7529d6452f80d957ea5996e34e2f1ee397ee44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d345b4af61fd33f44fbe023c678be0c23fc32dde (diff) | |
| parent | d5f71b7f7dd8491cd519c0a309f56189ce82b273 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7d1246e95d -s ours am: 712c2cb2d2 -s ours" into nyc-mr1-dev-plus-aosp
am: d5f71b7f7d -s ours
* commit 'd5f71b7f7dd8491cd519c0a309f56189ce82b273':
Import translations. DO NOT MERGE
Change-Id: Ibc01e69354ce33cd24d6de318c29395bf176e5a6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions