tree 2d29dc8c86335005b508fcf569ef2e9a2388396f
parent 6ab6fefc2e5b47a94da45e28da7517997befa44a
parent 7c0cbc554829d4a557d120df2b8d7e7900f0bd76
author Android Build Merger (Role) <android-build-merger@google.com> 1502415443 +0000
committer Android Build Merger (Role) <android-build-merger@google.com> 1502415443 +0000

[automerger] Merge "DO NOT MERGE Add test to prevent touch location leakage." into mnc-dev am: 17cd03d8c2 am: 19a428ead3 am: e7790b6e8c skipped: 7c0cbc5548

Change-Id: Ia762b2bf3e332689a13c083b62b509c6ef9d84dd