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