diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-23 00:05:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 00:05:42 +0000 |
| commit | 4201eb79e3d9cf505d44a73ac0f595879924d647 (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b66ae49275f362f12801a1010240645a9825b1db (diff) | |
| parent | bcd5e6d24fa2b983417f7a6d73db184ba736facc (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 917ead578b -s ours am: 713a057fb6 -s ours" into nyc-mr1-dev-plus-aosp
am: bcd5e6d24f -s ours
* commit 'bcd5e6d24fa2b983417f7a6d73db184ba736facc':
Import translations. DO NOT MERGE
Change-Id: I9023b919928eedd5fc8fc85dd4673ae1a769f439
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions