| commit | 00496c40f62c688915d6f125f9e32d40d5b9cb07 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon May 15 16:01:51 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon May 15 16:01:57 2017 +0000 |
| tree | c743bc704888b33918bbf212b438383fa7f737e7 | |
| parent | 1ab1da3f250d169bc5c21929d7d40868a21af0d8 [diff] | |
| parent | 04a4e1de71189c6ead8cb363f393ea7e0e4db0c7 [diff] |
Merge "Fix a deadlock in LockSettingsService" into oc-dev