tree 36e1cde6217588c57f255f7bad2cf4d7002c8949
parent a810acbd4dcf52a621ba61e6f26671e2ab0ca8e0
parent fba14c7da762727eb929c3e48ac244dbe99fec6c
author Michael Ryleev <gmar@google.com> 1464119130 +0000
committer android-build-merger <android-build-merger@google.com> 1464119130 +0000

Merge changes I40c9ea47,I593aeed5 am: c7878469be
am: 5cf2f5946c

* commit '5cf2f5946c5e9d09d9325a5286fe472b4e75f841':
  trusty: storage: add tests
  trusty: storage: add client lib for testing

Change-Id: I39d2c1b49e92b15190fb92b66aa20e8586716957