OSDN Git Service

Merge "Fix ordering of notifying dismiss callback" into oc-dev am: e85f8eb0ca
authorJorim Jaggi <jjaggi@google.com>
Thu, 18 May 2017 22:47:12 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 22:47:12 +0000 (22:47 +0000)
commit7a52a58ffb1097348ba8da078f1cd223bacb2e49
tree7bfe7ec6b7e67ccb5a074f3b6120387b9e8ed5a5
parentf4876d18e7dcad12f70cd7866c56c3f226ba1172
parenta55a6626004cd22eb80aee99f8423d9980f547e0
Merge "Fix ordering of notifying dismiss callback" into oc-dev am: e85f8eb0ca
am: a55a662600

Change-Id: Ic24eaca241ddc2c84395a1d2bdaf6dd554b0e55b
services/core/java/com/android/server/trust/TrustManagerService.java