diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:34:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:34:33 +0000 |
| commit | cdd880f96cb75ff3b57e16c9ed2ede9fb660b27a (patch) | |
| tree | 37ef0dfb7ead444994fd79f60977c71bbaa9ce96 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6bc849b33fb9777636ad931c71cd27338298799 (diff) | |
| parent | 41a1d11f98d170ed41935d35fc1a3ed4af2c59fd (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 41a1d11f98 -s ours
* commit '41a1d11f98d170ed41935d35fc1a3ed4af2c59fd':
Import translations. DO NOT MERGE
Change-Id: I2e0d39f64f0ebd738cad7d7676eb809f1fe88db7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions