tree 722816ff9ba9b99d8b515433505f184c8cfbb706
parent 511161112169f49514b24068854bebd2ac097ae2
parent 066eb30abf78bd2d52a23f3068936a6b67cd03d8
author Dees_Troy <dees_troy@teamw.in> 1377348123 -0500
committer Gerrit Code Review <gerrit@198.50.184.117> 1377348123 -0500

Merge "Fix AOSP decrypt when TouchWiz code is present" into twrp2.5