tree 6ce3ef09ac9c92f9b5cf4f0dddf1a0f9d20d130d
parent e254b4e9e4ac843e3e2ac9c81b600b7f8d024a0b
parent b3ddc0a4bf4334fa114d2b1716675d29a7024c1f
author Tao Bao <tbao@google.com> 1471501033 +0000
committer android-build-merger <android-build-merger@google.com> 1471501033 +0000

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

Change-Id: I204d7fedd2f950da41c3a481231c459fc32d0056