diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-05-24 12:57:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 12:57:08 -0700 |
| commit | 942bc252ce7dbd229e28ee3a44dc94e1dd0b0d90 (patch) | |
| tree | daeccd1270d7bec3f9a9caa944a249d8d996c43f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9fd4c6d3aeea46820c7ab637b0bc6556b798bc2b (diff) | |
| parent | fcdbcf9174f7a5404da4514b71041c3d37692d15 (diff) | |
am fcdbcf91: (-s ours) am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
* commit 'fcdbcf9174f7a5404da4514b71041c3d37692d15':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions