diff options
| author | Adrian Roos <roosa@google.com> | 2015-07-29 21:34:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 21:34:44 +0000 |
| commit | 5334b265af71a31b0cf428b97b437ac040c067dc (patch) | |
| tree | cbb04eef587f67b9ba2876c9231e8d096a9e3e43 /rs/java/android/renderscript/Script.java | |
| parent | 1a9097b5695759aa1e9e8fea563a7a569c0b345f (diff) | |
| parent | aeda904f55e43b37b0783f4ef2d1a183e3d778db (diff) | |
am aeda904f: am 4371922d: am 8e9b33f8: am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev
* commit 'aeda904f55e43b37b0783f4ef2d1a183e3d778db':
Fix and deprecate lock pattern related settings
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions