Xin Li 23e27db576 Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from ... oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ia33311cd1fd26dfaea59a69317b306fb91203c40 Merged-In: I03d06b10807e8a313c9654c2e1db36bfb59e3f99		2017-11-14 13:19:45 -08:00
..
gatekeeper	Move trusty reference implementations to /vendor	2017-08-22 11:23:45 +08:00
keymaster	Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from	2017-11-14 13:19:45 -08:00
libtrusty	Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' from	2017-11-14 13:19:45 -08:00
storage	resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926	2017-10-17 21:57:49 +00:00
Android.bp	Remove nvram trusty implementation.	2017-08-15 18:52:42 +08:00
trusty-base.mk	trusty: add trusty-base.mk	2016-05-02 15:12:01 -07:00
trusty-storage.mk	trusty: storage: implement storage proxy daemon	2016-05-02 15:12:01 -07:00