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