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