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