tree b85cd408f739300b9e9995e4d1d83e1c88355c41
parent 4e4474c9c596e1feda81a97e7c4e95b5d2e68467
parent f599414aecd1f57059c763460b882086824e728d
author Tao Bao <tbao@google.com> 1471500886 +0000
committer android-build-merger <android-build-merger@google.com> 1471500886 +0000

Merge "Free mmaped area if keys fail to load"
am: f599414aec

Change-Id: Id96153c211ca1fcc1cd78d6e662b0b48795c0d76