tree 9cf1ea3488bb790d677a6b7082b6aa7ef62a2990
parent 9ca25502c05854288733ee5142e8bf6594821f83
parent 5693d403600b430acb995573d1648f6a551ed510
author Jeff Brown <jeffbrown@google.com> 1395260489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395260489 +0000

am 5693d403: am 96abebd0: am 80af5316: am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev

* commit '5693d403600b430acb995573d1648f6a551ed510':
  Fix inverted conditional in View.setFilterTouchesWhenObscured.