tree 7bfe7ec6b7e67ccb5a074f3b6120387b9e8ed5a5
parent f4876d18e7dcad12f70cd7866c56c3f226ba1172
parent a55a6626004cd22eb80aee99f8423d9980f547e0
author Jorim Jaggi <jjaggi@google.com> 1495147632 +0000
committer android-build-merger <android-build-merger@google.com> 1495147632 +0000

Merge "Fix ordering of notifying dismiss callback" into oc-dev am: e85f8eb0ca
am: a55a662600

Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b