tree 76bf56415da803b44f8273f02278c9a2d1db5d77
parent 7b330a1f2ba9155eb6198557294057ae87940a39
parent 78fa7a1b3f8a5a227807f426a5d4fdc2a26e7998
author Svetoslav Ganov <svetoslavganov@google.com> 1468977135 +0000
committer android-build-merger <android-build-merger@google.com> 1468977135 +0000

Merge \"Revert \"Prevent apps to overlay other apps via toast windows\"\" into nyc-mr1-dev
am: 78fa7a1b3f

Change-Id: I30b84189b2c2c4566c837cd1b8837053d6944988