| commit | 94143edff6d5f2639384e261b6cdb2109e744a04 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon May 15 16:10:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 15 16:10:04 2017 +0000 |
| tree | 662075145b37ecf2316e1d7736065ada5d8a8e8d | |
| parent | 04f57e2d509434b20e6f350932a562c3f1108760 [diff] | |
| parent | 00496c40f62c688915d6f125f9e32d40d5b9cb07 [diff] |
Merge "Fix a deadlock in LockSettingsService" into oc-dev am: 00496c40f6 Change-Id: I112cb14469f644fd38da561e491c580c01a1e7b3