diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-03 00:30:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:35 +0000 |
| commit | 2135ce48a1b39757083085d763011ac345972265 (patch) | |
| tree | 1b501424ea3228ec785ee53fa5c74db2b4f9623a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fa2b3c24c7ef08d7ba72a3fdbc8cb1a1b56f0e6d (diff) | |
| parent | 97267def8219d6ad3d8a96449b08653ae1bd6832 (diff) | |
am 97267def: (-s ours) am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '97267def8219d6ad3d8a96449b08653ae1bd6832':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions