diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:58:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:58:46 +0000 |
| commit | 91ca4af140e05f8ad4bb5a61168fc158922e42ba (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a01a86547f8852351986d038d5911edb6f694cf4 (diff) | |
| parent | aba7e13c03bbdff5213c1f162becf9f65b9aac8f (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7533f3260e -s ours am: 9283938bc7 -s ours" into nyc-mr1-dev-plus-aosp
am: aba7e13c03 -s ours
* commit 'aba7e13c03bbdff5213c1f162becf9f65b9aac8f':
Import translations. DO NOT MERGE
Change-Id: If3f8a2d6198e1efa9e4cce6e2915f339b48959c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions