OSDN Git Service

Merge "Revert "Add keymaster VTS tests."" into oc-dev
authorKeun Soo Yim <yim@google.com>
Wed, 29 Mar 2017 20:31:05 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 20:31:05 +0000 (20:31 +0000)
am: bf0f670580

Change-Id: I28bfff5b7e2a1109d32f43a84cfa362562c13bd5


Trivial merge