diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-05 14:23:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:23:12 -0800 |
| commit | 17bc7fabd56b2a50dbef372c228b6333147ea8a8 (patch) | |
| tree | e6d1d2d4af2209734e5c4dda9b118978e5166798 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0181bd9529bab5b939c0058e099766d2896f95fd (diff) | |
| parent | 8ecf2307acb8fbb9c9b6378fa7278e5316dc38b7 (diff) | |
am 8ecf2307: (-s ours) am 584b1cc0: (-s ours) am 0bdaa9a5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '8ecf2307acb8fbb9c9b6378fa7278e5316dc38b7':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions