| commit | 50a006d7b05c7eab4e144734d0a4815bbed3981d | [log] [tgz] |
|---|---|---|
| author | Alex Salo <asalo@google.com> | Wed May 22 18:45:21 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 22 18:45:21 2019 -0700 |
| tree | 7e778be6c67300ecd965afc742ca9e36a18e1ab9 | |
| parent | f45d7975891c8363904ddc2cdbace086ae763a44 [diff] | |
| parent | 25b6bb5d00fd4933894739ad34ea4c383990d747 [diff] |
Merge "Merge "Prevent deadlock in AttentionManagerService" into qt-dev am: bcfa3c158e am: e19629a039" into qt-r1-dev-plus-aosp am: 25b6bb5d00 Change-Id: Ibf27ae2cd548f99dc9b17b9483c13fa488b226b0