diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:13:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:13:58 +0000 |
| commit | 02171a04a6d416f6c769c79174548a83cd564027 (patch) | |
| tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 77ceede11b89918f649b4f6d5aca98cee55569fd (diff) | |
| parent | f47a2c9fb9bfe9bc09e1df96f246f681683bd38a (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: f47a2c9fb9 -s ours
* commit 'f47a2c9fb9bfe9bc09e1df96f246f681683bd38a':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions