diff options
| author | Victoria Lease <violets@google.com> | 2013-01-18 10:53:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-18 10:53:48 -0800 |
| commit | 00ef2a3622baa477d7dfdd8df7d68bab84008b4d (patch) | |
| tree | f6e5ac0b331d921c067f09cd9f6b26abacaf6545 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dbdf8767e24d5d5ecc7a1751a103150676a4aa86 (diff) | |
| parent | c62eefa02aefb0bf3870e063aa47df6dccbf5862 (diff) | |
am c62eefa0: 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 'c62eefa02aefb0bf3870e063aa47df6dccbf5862':
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