diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-25 16:36:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 16:36:58 +0000 |
| commit | 87431eeac9c72854ff56727100ff3882ffdca3ce (patch) | |
| tree | b41089cba4e25d767b60f17d9951be0573fea5a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | aec2c787a5234327377cb8f07cbee9407f13b52e (diff) | |
| parent | 08f5cd338566d5bab06003eadf29156bd6367690 (diff) | |
am 08f5cd33: (-s ours) am 763611dd: (-s ours) am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '08f5cd338566d5bab06003eadf29156bd6367690':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions