tree 0130bc8d7c3cc72f8f6a9973a874c07464649c0f
parent eb73fcdcb83fe61cb1dd2fe081f458d24ed5e217
parent bc7edfe56f87e5cabdb6e735be4fd0f47e3eedcf
author Steven Moreland <smoreland@google.com> 1493956240 +0000
committer android-build-merger <android-build-merger@google.com> 1493956240 +0000

Merge "trusty/storage/* to Android.bp" am: 1dcd257a21 am: 1561e34bf4 am: 9b7632ef8a
am: bc7edfe56f

Change-Id: I4b762bf23b062862824a98bb9e7c099388ae3e5c