diff options
| author | Eric Fischer <enf@google.com> | 2010-10-25 16:26:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-25 16:26:58 -0700 |
| commit | f51964f64fa043643aa1f107fd93c566e814e29c (patch) | |
| tree | 275e89d4d02bd1082d810d98f758a109134ea1d0 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 551397d5eb91d1bf13b9eff5a89824ea1b3c479e (diff) | |
| parent | b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b (diff) | |
am b2ddeee2: (-s ours) am 3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b'
* commit 'b2ddeee2d2a4151210a1a3b3cc8af90477fbee2b':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions