diff options
| author | Jim Miller <jaggies@google.com> | 2015-08-03 20:41:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 20:41:52 +0000 |
| commit | d14fa9b4158979afb4a43e2ea572a216ca5dc8d4 (patch) | |
| tree | 19ae5110415aa72dbe8a98e2216d252f96fc46ec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5c8a5d0ff4493e32e9cd2127591a707637caf16a (diff) | |
| parent | 3f9b9f2bbe81e25cfc2754e19a129895f8ad1011 (diff) | |
am 3f9b9f2b: am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev
* commit '3f9b9f2bbe81e25cfc2754e19a129895f8ad1011':
Don't wipe device because of short PIN, patterns or passwords
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions