tree a3052f41ed4fa4a266cba24c36e6a24a10041076
parent 908bd8dea2fe72656d53c397525d98160bfc3df6
parent 27300925e66d561b2bb0da0ef6a8e63649749e7f
author TreeHugger Robot <treehugger-gerrit@google.com> 1538178838 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1538178838 +0000

Merge "Disambiguate fs-verity and apk-verity"