tree d7ce02edcf0c62207ebb06a33bb7cb71c3568ba6
parent 243edb89501bb8bcc8e6c12347e6e6db4ad8ca33
parent a083c8f83aa06e1d633aa58930bd316cce835de2
author Jason Monk <jmonk@google.com> 1501868314 +0000
committer android-build-merger <android-build-merger@google.com> 1501868314 +0000

Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
am: a083c8f83a

Change-Id: I472011ba027b2d6b363807cee098e6114c231d38