diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-09-21 14:43:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 14:43:06 -0700 |
| commit | bff4dcec24bf8475c8a808a06da7bd5cb77ffdbd (patch) | |
| tree | 1603443c7484307ee8d221dfaaa068971a240840 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6d842c08ba20d6e118db351272a098d70641b79 (diff) | |
| parent | 447c677e97e90344881371ecef1ec8aca1b3acc0 (diff) | |
am 447c677e: (-s ours) am 1139b326: Merge "DO NOT MERGE Tweaked EdgeGlow to better match user expectations." into gingerbread
Merge commit '447c677e97e90344881371ecef1ec8aca1b3acc0'
* commit '447c677e97e90344881371ecef1ec8aca1b3acc0':
DO NOT MERGE Tweaked EdgeGlow to better match user expectations.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions