diff options
| author | Kenny Root <kroot@google.com> | 2010-09-14 09:46:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 09:46:40 -0700 |
| commit | 3ca2691446d333d52b1c0a39e6df74e03c2407cc (patch) | |
| tree | 2049104a026f7844b28260752dd7cde4d4dcf0af /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5 (diff) | |
| parent | 3043441511e4483d24dc6f42e1ee7f7e9dc71be2 (diff) | |
am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread
Merge commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2' into gingerbread-plus-aosp
* commit '3043441511e4483d24dc6f42e1ee7f7e9dc71be2':
Dedupe timestamp in PackageSettings
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions