tree caabfbdac03b9be9bf5217b65cb34d0be779f8f5
parent 3a40330f3f628b1c10f7fe57333c24f50be9849c
parent a083c8f83aa06e1d633aa58930bd316cce835de2
author Jason Monk <jmonk@google.com> 1501868315 +0000
committer android-build-merger <android-build-merger@google.com> 1501868315 +0000

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

Change-Id: Ic17c6dd90a3ff3acd71885814d447a38b2c7b75d