diff options
| author | Craig Mautner <cmautner@google.com> | 2012-11-26 11:43:28 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-26 11:43:28 -0800 |
| commit | 1ee927f42bea9817fc16d5ee6532ce46e099f4b4 (patch) | |
| tree | 08f36017c24928127a1e022ed5db7b4b7db7094c /graphics/java/android/renderscript/RenderScript.java | |
| parent | 90e3dfa55c52f202f3d5a54d915fdd1ddb3cd47a (diff) | |
| parent | 8de91ce1e037408064f453b26f1fe725cd6377e3 (diff) | |
am 8de91ce1: am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev
* commit '8de91ce1e037408064f453b26f1fe725cd6377e3':
Ignore invalid combination of PowerManager flags.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions