diff options
| author | Eric Fischer <enf@google.com> | 2010-09-07 11:08:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 11:08:19 -0700 |
| commit | aab7375799e76ec2e429fbd8224d0c6e8cc96463 (patch) | |
| tree | a4801117a46fa624f1becad6fbd33f7b57c51db6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f17bd19acbb88429b50a1497bfec0752b456d5c6 (diff) | |
| parent | 745e751b251baa38e94dfce1fe264574d0204cc2 (diff) | |
am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp
* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
Preserve old translations for changed strings. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions