Merge "Move ScanResultMatchInfo to its own class" into oc-dr1-dev
am: 4e22b46ea8

Change-Id: Id54cbfda0f25d4df53ce575292d55ab3b61bbbb4
tree: c6a8a72b7d07ec534e1e8a6639448faa5f88d1cf
  1. service/
  2. PREUPLOAD.cfg