Merge "Do not wrap test case for long running tests"
am: d5b26ac633

Change-Id: Ib496079cc056d1b11f109ee9e5d066c0878c1fcc
tree: 178270a9cd7bb2bb3258ea3e3462de418dc82a87
  1. acts/
  2. Android.mk