commit | b110b5450e1bc01bb97188a864551909622df102 | [log] [tgz] |
---|---|---|
author | Tom Cherry <tomcherry@google.com> | Fri Mar 31 16:47:41 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 31 16:47:41 2017 +0000 |
tree | 5fe58bdeea1841181a9e3a1e4b22be7755fbc173 | |
parent | fcc14632bda26a5c1edbb822b5417e9ffabf4a73 [diff] | |
parent | ad48884579b86b65ff97ca62055051ecba6a2a32 [diff] |
Merge "Removed e4crypt_create_device_key" am: 582a79634a am: 6cf3d8775f am: ad48884579 Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3