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