tree 7fe3c75a2fada291c9b5004a08ec54483dbddc9c
parent 9f554cee9723ffc22be6218ddbff810769c3e42e
parent 71413f4ee9a2d345da059793e795d798924b2209
author Ethan Yonker <dees_troy@teamw.in> 1393444854 +0100
committer Gerrit Code Review <gerrit2@gerrit> 1393444854 +0100

Merge "Check crypto footer before offering to decrypt" into android-4.4