diff options
| author | Costin Manolache <costin@google.com> | 2011-03-01 12:29:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 12:29:40 -0800 |
| commit | 66d46ac61478c967ed45bd1c27b0436654d54299 (patch) | |
| tree | 72c5fcbdb7684d5c336c4bbae16a8ced13d3f91b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7fff2d19a24f9f9b669676864dc5652ab179d2fc (diff) | |
| parent | db52ab69f22e24615eaa2e8f9845e157426d3dd6 (diff) | |
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 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
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