Merge "Deqptestrunner efficient filtering am: 57792529e7 am: be1738c4a4" into nyc...
authorAaron Holden <aaronholden@google.com>
Tue, 7 Jun 2016 03:47:11 +0000 (03:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 03:47:11 +0000 (03:47 +0000)
am: 7f6128d3a9

* commit '7f6128d3a9b8f230a2f191d8c795a64532bcd57d':

Change-Id: Ibb31a268687b175130f6e56b09ca869b391fb672


Trivial merge