tree 1b4392cf3f228fa9fef46f96d7810fe6adff0b64
parent eeb97cd1e16e7c05715af5e1847bfe506892875f
parent 09583bdc884547351b59b2337263fa39e6992331
author Charles Mendis <cmendis@google.com> 1482176386 +0000
committer android-build-merger <android-build-merger@google.com> 1482176386 +0000

Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 5109de9bd3" into nyc-mr2-dev-plus-aosp
am: 09583bdc88

Change-Id: I32f66d506e2a3d9eefdfcf800ea593cf71396d96