OSDN Git Service

Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f am: ad48884579
authorTom Cherry <tomcherry@google.com>
Fri, 31 Mar 2017 16:55:16 +0000 (16:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 31 Mar 2017 16:55:16 +0000 (16:55 +0000)
am: b110b5450e

Change-Id: I7fde3ecb4f48abfb0107f08960833c5ac38e7137


Trivial merge