diff options
| author | Victoria Lease <violets@google.com> | 2013-01-18 10:51:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-18 10:51:25 -0800 |
| commit | c62eefa02aefb0bf3870e063aa47df6dccbf5862 (patch) | |
| tree | 893e6a03b022f544e25717076cfe294c73f80024 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5287cd7476e0096f5f36866f81b47950343e4155 (diff) | |
| parent | 3599f0a02129c238177806ce3d6db20853230d4d (diff) | |
am 3599f0a0: (-s ours) am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '3599f0a02129c238177806ce3d6db20853230d4d':
DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions