diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-16 04:00:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-16 04:00:45 +0000 |
| commit | 2abea6c457e869e18da9a32fed548874384add96 (patch) | |
| tree | 298dcebf229b7d3a5284aee574a144ca11b4a4f0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0be2a432847ecff029797228c58d744c6041844b (diff) | |
| parent | 129ad0e15bafe65f3060b7bd4ea9eb973ece767b (diff) | |
am 129ad0e1: (-s ours) am ad6b1426: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '129ad0e15bafe65f3060b7bd4ea9eb973ece767b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions