Merge "Deqptestrunner efficient filtering am: 57792529e7 am: be1738c4a4" into nyc...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 7 Jun 2016 03:44:37 +0000 (03:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 03:44:38 +0000 (03:44 +0000)

Trivial merge