Jae Shin 0ed84e3e91 resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master ... Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia163118a25cfc2e079803c230d69e55357acd3fa		2017-09-15 16:50:34 +09:00
..
tests	gatekeeperd: use std::unique_ptr	2017-09-15 01:12:43 +00:00
Android.mk	Use HIDL-generated HAL interworking code	2016-11-21 14:05:04 -08:00
gatekeeperd.cpp	resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master	2017-09-15 16:50:34 +09:00
gatekeeperd.rc	Move gatekeeperd to system-background cpuset.	2016-04-15 14:29:40 +02:00
IGateKeeperService.cpp	Credential FRP: keep gatekeeperd credentials after reset	2017-04-18 20:50:52 +00:00
IGateKeeperService.h	Credential FRP: keep gatekeeperd credentials after reset	2017-04-18 20:50:52 +00:00
IUserManager.cpp	Fix google-explicit-constructor warnings.	2016-04-29 15:44:04 -07:00
IUserManager.h
SoftGateKeeper.h	gatekeeperd: use std::unique_ptr	2017-09-15 01:12:43 +00:00
SoftGateKeeperDevice.cpp
SoftGateKeeperDevice.h	gatekeeperd: use std::unique_ptr	2017-09-15 01:12:43 +00:00