tree c4b0868644b3b49c3fc656929432400821657be9
parent 3b740fa6890be4c17e1b3fa9914152e020de54e5
parent 831af8d8408b5910e74ee02c269c7ad3f244a602
author Andrew Scull <ascull@google.com> 1501017619 +0000
committer android-build-merger <android-build-merger@google.com> 1501017619 +0000

Merge "OemLock functional VTS test." into oc-dr1-dev
am: 831af8d840

Change-Id: I31d13650919cac6be76ae2f8a6519fa6e64a8741