diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 17:55:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:55:23 +0000 |
| commit | 9793fa9254a2f13a8ec075e6ea53992e73c612aa (patch) | |
| tree | 3261aea381da3a870a9801bfdc9f3e38b10b1acb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5f2dc6f3e1de329e3ea3b9927ef91d95615adbe5 (diff) | |
| parent | 71ed8648e2c2b5b2ee4d74fcaf6be2b3f4e63388 (diff) | |
am 71ed8648: (-s ours) am 8455d018: (-s ours) am 5114a0ec: (-s ours) am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '71ed8648e2c2b5b2ee4d74fcaf6be2b3f4e63388':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions