tree a0d6d734f69f090563593e924efae2e4c78b9b17
parent 3e56e39e5b144c1d8ff3266e5e36b5ebf4ba1134
parent 725ca56851b9a54c4baa07e22ac42587124af085
author Mattias Nissler <mnissler@google.com> 1465334260 +0000
committer android-build-merger <android-build-merger@google.com> 1465334260 +0000

Merge "fs_mgr: Remove incorrect free() on error paths in load_key()" am: 35d84096e9 am: 6f29ec0197
am: 725ca56851

* commit '725ca56851b9a54c4baa07e22ac42587124af085':
  fs_mgr: Remove incorrect free() on error paths in load_key()

Change-Id: I1101606fbb8abfc012442cb52952d1377240956d