diff options
| author | Victoria Lease <violets@google.com> | 2013-01-18 10:49:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-18 10:49:07 -0800 |
| commit | 3599f0a02129c238177806ce3d6db20853230d4d (patch) | |
| tree | 85f047b9b3a75e01e1680ce7467d6e5a25e47452 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6d59e0ead242978eff8a64d314a1f8554694d8a6 (diff) | |
| parent | 0cf97d32178b689184866e731c0a4105d8223d80 (diff) | |
am 0cf97d32: (-s ours) Merge "DO NOT MERGE Prevent OOM death for services under ServiceWatcher\'s care." into jb-mr1.1-dev
* commit '0cf97d32178b689184866e731c0a4105d8223d80':
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