diff options
| author | Costin Manolache <costin@google.com> | 2011-03-01 13:28:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 13:28:03 -0800 |
| commit | c039bb5d1ee13660142595bf21b4ac1d1ae129a5 (patch) | |
| tree | f3535a88b27ac683926fe037a2624830eb67e6b1 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4b8c9b740528301d3ca60fe3b4b861fcd85ceb0a (diff) | |
| parent | 66d46ac61478c967ed45bd1c27b0436654d54299 (diff) | |
am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions