diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:50:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:50:43 +0000 |
| commit | ec8e6395fd7a7c603a2baf09fdde55a4bb0f05d3 (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 960153471b5b9ab8de8ffc9d9e5f4fa6a7499b58 (diff) | |
| parent | b07991d4b8f5bdd3f5d0791817c811153b178a44 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 97360f90ce -s ours am: baf20ac60c -s ours" into nyc-mr1-dev-plus-aosp
am: b07991d4b8 -s ours
* commit 'b07991d4b8f5bdd3f5d0791817c811153b178a44':
Import translations. DO NOT MERGE
Change-Id: Ic08b9dd97d46e6c6fe5974fbb38e188a1c20a887
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions