| commit | a0a0d350f54129abd8d829ba289c10893f51420a | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon May 15 16:18:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 15 16:18:01 2017 +0000 |
| tree | cfb1c26c489c1ee8af7e5a590b85b512280c161f | |
| parent | db0a4f21e3cc21412132cc12de83ca6a3cc94e5d [diff] | |
| parent | 94143edff6d5f2639384e261b6cdb2109e744a04 [diff] |
Merge "Fix a deadlock in LockSettingsService" into oc-dev am: 00496c40f6 am: 94143edff6 Change-Id: I95bb0cbed6b2c2821c183c2b2448371828bfcab3