tree 04ab05e6a6d29d654e8da701f1025f1b7ff90e9d
parent 1805ba1d76aedc3362d1ec5dd4e0d08e8bbbe141
parent dbc5a93449c6598496a471026a651f50868207e0
author Android Build Merger (Role) <android-build-merger@google.com> 1480961791 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480961795 +0000

Merge "Disable swipe-to-dismiss for not cancelable dialogs. am: f7964be938 am: 9120012566" into nyc-mr2-dev-plus-aosp