diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-11-27 15:37:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-27 15:37:40 -0800 |
| commit | f426ace9dab65c88b36a047bf921070edcf8cf61 (patch) | |
| tree | 4b9ad05c03c5d4771627eeab5bb0f2d7c79a196d /graphics/java/android/renderscript/RenderScript.java | |
| parent | 09a526faf311f77017f37af3fe8aba45bc2c32fb (diff) | |
| parent | 32f0742e52de8cebdbbb6c8ede9d6f4315d50189 (diff) | |
Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions