tree 920a2c2d5fba1bf2e7122dce66abf854c72906f5
parent 908810533225fe3ca76894e40244a7c53343668e
parent 8296af26bb00779f55a806a008f5b5311ead4016
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516747368 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516747368 +0000

Merge "Merge "Allow clearkey tests to run if no vendor modules" into oreo-vts-dev am: d5c6411aeb  -s ours am: c0e92d519e  -s ours" into oc-mr1-dev