No description
Find a file
Rubin Xu 0010dae9ff resolve merge conflicts of 2b93ec4 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie605cbb7f90eca6d17c2c5f6a50ec1ee21edf633
Merged-In: I6709b7562d47ad6156bee88a9e2d961f8a4a797d
2017-11-03 23:23:43 +00:00
keystore resolve merge conflicts of 2b93ec4 to oc-dr1-dev 2017-11-03 23:23:43 +00:00
keystore-engine Remove use of UniquePtr from keystore 2017-05-01 12:34:46 -07:00
softkeymaster Remove use of UniquePtr from keystore 2017-05-01 12:34:46 -07:00
MODULE_LICENSE_APACHE2 Add NOTICE and MODULE_LICENSE_ files. 2015-11-02 09:13:29 -08:00
NOTICE Add NOTICE and MODULE_LICENSE_ files. 2015-11-02 09:13:29 -08:00
OWNERS Add OWNERS in system/security 2017-06-02 17:39:48 -07:00