OSDN Git Service

Merge "Removed e4crypt_create_device_key" am: 582a79634a
authorTom Cherry <tomcherry@google.com>
Fri, 31 Mar 2017 16:45:09 +0000 (16:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 16:45:09 +0000 (16:45 +0000)
commitad48884579b86b65ff97ca62055051ecba6a2a32
tree7bd9691075b98a200448dc302a76c702d19cd9ff
parent2b0eed2d9cf08352d43f7155a764dc4ba73af90a
parent6cf3d8775f6da0aa37b85238a1ac85e6a484ce58
Merge "Removed e4crypt_create_device_key" am: 582a79634a
am: 6cf3d8775f

Change-Id: Icb460a36cabc6181af15f8c8beaf4877934d6a31