[automerger skipped] Merge "sensors:2.0:vts fix functional test for typeAsString field" am: e3fc570d6d
am: 1f65d20a39
-s ours am: d68953dcc3
-s ours am: 76b1b33cad
-s ours am: 81e020162f
-s ours
am skip reason: Change-Id Ib5f8fd513313670e88c2b973c1ff724658914eb2 with SHA-1 908e4479dd
is in history
Change-Id: Id63fe1fecae198098e30bec85f385d64aa124883
This commit is contained in:
commit
3a2a898f0e