tree 72c5aed093e456466763b1fdef1fb19b32db6d54
parent fc541d67d89c63c6309beec32bd81f09f8053167
parent 7e9786d79158f6e6e732d6a24f17e4b127541469
author Ethan Yonker <ethanayonker@gmail.com> 1481139557 +0000
committer android-build-merger <android-build-merger@google.com> 1481139557 +0000

Merge "ext4_utils: Fix return value in e4crypt_policy_get" am: 6c26bba8a9 am: 6c0637a8f5
am: 7e9786d791

Change-Id: I390299006a0af18ac819afe8e1fbfce9c9c2d475