tree ddbcaf717c54b25306d374293b02635979f23f34
parent 6986f29bb93a6aaaeaaddcab081d0e0afd7082e8
author Michael Wright <michaelwr@google.com> 1458685055 -0700
committer The Android Automerger <android-build@android.com> 1461294747 -0700

DO NOT MERGE Take advantage of new MotionEvent flag to prevent tapjacking.

Bug: 26677796
Change-Id: I563541f0a42564b854af0f8037c1d4741c79a2ac

Fix merge conflict when cp'ing ag/903239 to mnc-mr1-release