| commit | 534e2fd94f741c6d5e35bb3a3ac3afd4a76584bb | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <ascull@google.com> | Fri Sep 08 19:52:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 08 19:52:24 2017 +0000 |
| tree | 480d213e44dfe6245df61329b52ebd4a721dcad3 | |
| parent | ada46b3fe737e94fc6ffa2afbacc419e15f01b67 [diff] | |
| parent | 07f6b5581a65e0a4af7a94cb97b6e190cb3e2c0e [diff] |
Merge "OemLockService: remove canUserAllowOemUnlock()" into oc-mr1-dev am: 5664b30008 am: 07f6b5581a Change-Id: I0a58b57d64c917ee7f16506b0ee6c03cd6be9059