tree fef177eda0f47d3037336b7761b0a9e596883f02
parent f7aacf81fa8a800a585620fd4fa1a34fcc5bb473
parent 9b7632ef8a3d7d163288f03675fa0333a9f606e1
author Steven Moreland <smoreland@google.com> 1493956075 +0000
committer android-build-merger <android-build-merger@google.com> 1493956075 +0000

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

Change-Id: I0cd118b47b1b983012666bd2f79fc78cc1b5128c