diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 16:39:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:39:03 +0000 |
| commit | 9bc4bdea43d9cea237b1f96e737d03efa6c0b802 (patch) | |
| tree | e822e78638d7e4dc7820d3ce3823f91656ee4fca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b23235829c7e8a6531ba98defce6349094dff238 (diff) | |
| parent | 1491492a1bdb5b9d0be68f9f34460d155a72e10e (diff) | |
am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '1491492a1bdb5b9d0be68f9f34460d155a72e10e':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions