tree 1fe6befc08021ec3ad8a456217f1cad2f9c7e970
parent 7f5f1b12ff8940c3d5bd842b40ce983641e33ab3
parent a294e197b483ce3002e5e37837ad343435391f77
author Risan <risan@google.com> 1542140003 -0800
committer android-build-merger <android-build-merger@google.com> 1542140003 -0800

Merge "StubVolume as first class Volume in Vold" am: dcbce84fed am: 14955896e5
am: a294e197b4

Change-Id: Iaec41c8ffe6feaa59163987c914fa21edc7ae2cd