Merge "Add command line strictness to VTS" into oc-dev

author Wyatt Riley <wyattriley@google.com>

Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)
author Wyatt Riley <wyattriley@google.com>
Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)
diff --cc gnss/1.0/vts/functional/VtsHalGnssV1_0TargetTest.cpp
Simple merge
author	Wyatt Riley <wyattriley@google.com>
	Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 7 Apr 2017 15:03:50 +0000 (15:03 +0000)